Update README.md

settings: Enable JSX tag auto-close by default (#26481 )
Based on conversation with @maxbrunsfeld. Enabling Tag auto closing by default so that it is discoverable for new and existing users Release Notes: - Made it so JSX tag auto-closing is automatically enabled in supported languages
2025-03-11 16:12:50 -07:00 · 2025-03-11 21:01:41 +00:00 · 2025-03-11 20:50:18 +00:00 · 2025-03-11 20:29:02 +00:00 · 2025-03-11 19:43:14 +00:00 · 2025-03-11 19:15:03 +00:00
246 changed files with 6200 additions and 4715 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,7 +84,7 @@ dependencies = [
 [[package]]
 name = "alacritty_terminal"
 version = "0.25.1-dev"
-source = "git+https://github.com/zed-industries/alacritty.git?rev=03c2907b44b4189aac5fdeaea331f5aab5c7072e#03c2907b44b4189aac5fdeaea331f5aab5c7072e"
+source = "git+https://github.com/zed-industries/alacritty.git?branch=add-hush-login-flag#828457c9ff1f7ea0a0469337cc8a37ee3a1b0590"
 dependencies = [
 "base64 0.22.1",
 "bitflags 2.8.0",
@@ -490,6 +490,7 @@ dependencies = [
 "proto",
 "rand 0.8.5",
 "rope",
+ "scripting_tool",
 "serde",
 "serde_json",
 "settings",
@@ -658,9 +659,9 @@ dependencies = [
 "derive_more",
 "gpui",
 "parking_lot",
+ "project",
 "serde",
 "serde_json",
- "workspace",
 ]

 [[package]]
@@ -675,7 +676,6 @@ dependencies = [
 "schemars",
 "serde",
 "serde_json",
- "workspace",
 ]

 [[package]]
@@ -1234,27 +1234,25 @@ dependencies = [

 [[package]]
 name = "aws-lc-rs"
-version = "1.12.2"
+version = "1.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b7ddaa2c56a367ad27a094ad8ef4faacf8a617c2575acb2ba88949df999ca"
+checksum = "dabb68eb3a7aa08b46fddfd59a3d55c978243557a90ab804769f7e20e67d2b01"
 dependencies = [
 "aws-lc-sys",
- "paste",
 "zeroize",
 ]

 [[package]]
 name = "aws-lc-sys"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71b2ddd3ada61a305e1d8bb6c005d1eaa7d14d903681edfc400406d523a9b491"
+checksum = "6bbe221bbf523b625a4dd8585c7f38166e31167ec2ca98051dbcb4c3b6e825d2"
 dependencies = [
 "bindgen 0.69.5",
 "cc",
 "cmake",
 "dunce",
 "fs_extra",
- "paste",
 ]

 [[package]]
@@ -1824,7 +1822,7 @@ dependencies = [
 "bitflags 2.8.0",
 "cexpr",
 "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "lazy_static",
 "lazycell",
 "log",
@@ -1847,7 +1845,7 @@ dependencies = [
 "bitflags 2.8.0",
 "cexpr",
 "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "prettyplease",
 "proc-macro2",
@@ -2301,7 +2299,7 @@ dependencies = [
 "cap-primitives",
 "cap-std",
 "io-lifetimes",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -2329,7 +2327,7 @@ dependencies = [
 "ipnet",
 "maybe-owned",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 "winx",
 ]

@@ -2670,7 +2668,7 @@ dependencies = [
 "serde",
 "tempfile",
 "util",
- "windows 0.58.0",
+ "windows 0.60.0",
 ]

 [[package]]
@@ -2712,7 +2710,7 @@ dependencies = [
 "tokio-socks",
 "url",
 "util",
- "windows 0.58.0",
+ "windows 0.60.0",
 "worktree",
 ]

@@ -3047,6 +3045,7 @@ name = "component_preview"
 version = "0.1.0"
 dependencies = [
 "client",
+ "collections",
 "component",
 "gpui",
 "languages",
@@ -3139,7 +3138,6 @@ dependencies = [
 "smol",
 "url",
 "util",
- "workspace",
 ]

 [[package]]
@@ -4403,7 +4401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -4458,7 +4456,6 @@ dependencies = [
 "env_logger 0.11.6",
 "feature_flags",
 "fs",
- "git",
 "gpui",
 "http_client",
 "language",
@@ -4536,6 +4533,7 @@ dependencies = [
 "async-tar",
 "async-trait",
 "collections",
+ "convert_case 0.8.0",
 "fs",
 "futures 0.3.31",
 "gpui",
@@ -5053,7 +5051,7 @@ dependencies = [
 "text",
 "time",
 "util",
- "windows 0.58.0",
+ "windows 0.60.0",
 ]

 [[package]]
@@ -5064,7 +5062,7 @@ checksum = "5e2e6123af26f0f2c51cc66869137080199406754903cc926a7690401ce09cb4"
 dependencies = [
 "io-lifetimes",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -5450,7 +5448,6 @@ dependencies = [
 "db",
 "editor",
 "env_logger 0.11.6",
- "feature_flags",
 "futures 0.3.31",
 "fuzzy",
 "git",
@@ -5478,10 +5475,11 @@ dependencies = [
 "telemetry",
 "theme",
 "time",
+ "time_format",
 "ui",
 "unindent",
 "util",
- "windows 0.58.0",
+ "windows 0.60.0",
 "workspace",
 "zed_actions",
 ]
@@ -5681,8 +5679,8 @@ dependencies = [
 "wayland-cursor",
 "wayland-protocols",
 "wayland-protocols-plasma",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "windows 0.60.0",
+ "windows-core 0.60.1",
 "x11-clipboard",
 "x11rb",
 "xim",
@@ -6709,7 +6707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65"
 dependencies = [
 "io-lifetimes",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -7329,7 +7327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
 "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]

 [[package]]
@@ -10507,7 +10505,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
 "bytes 1.10.1",
 "heck 0.5.0",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "multimap 0.10.0",
 "once_cell",
@@ -10540,7 +10538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
 "anyhow",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "proc-macro2",
 "quote",
 "syn 2.0.90",
@@ -10734,7 +10732,7 @@ dependencies = [
 "once_cell",
 "socket2",
 "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -11656,7 +11654,7 @@ dependencies = [
 "libc",
 "linux-raw-sys",
 "once_cell",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -11915,20 +11913,21 @@ name = "scripting_tool"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "assistant_tool",
 "collections",
 "futures 0.3.31",
 "gpui",
+ "language",
+ "log",
 "mlua",
 "parking_lot",
 "project",
+ "rand 0.8.5",
 "regex",
 "schemars",
 "serde",
 "serde_json",
 "settings",
 "util",
- "workspace",
 ]

 [[package]]
@@ -13427,7 +13426,7 @@ dependencies = [
 "fd-lock",
 "io-lifetimes",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 "winx",
 ]

@@ -13567,7 +13566,7 @@ dependencies = [
 "getrandom 0.3.1",
 "once_cell",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -13614,7 +13613,7 @@ dependencies = [
 "theme",
 "thiserror 1.0.69",
 "util",
- "windows 0.58.0",
+ "windows 0.60.0",
 ]

 [[package]]
@@ -13991,7 +13990,7 @@ dependencies = [
 "tree-sitter-md",
 "ui",
 "util",
- "windows 0.58.0",
+ "windows 0.60.0",
 "workspace",
 "zed_actions",
 "zeta",
@@ -14698,7 +14697,7 @@ dependencies = [
 "theme",
 "ui_macros",
 "util",
- "windows 0.58.0",
+ "windows 0.60.0",
 ]

 [[package]]
@@ -15913,7 +15912,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -15970,6 +15969,28 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

+[[package]]
+name = "windows"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529"
+dependencies = [
+ "windows-collections",
+ "windows-core 0.60.1",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec"
+dependencies = [
+ "windows-core 0.60.1",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -16010,10 +16031,33 @@ dependencies = [
 "windows-implement 0.58.0",
 "windows-interface 0.58.0",
 "windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
 "windows-targets 0.52.6",
 ]

+[[package]]
+name = "windows-core"
+version = "0.60.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247"
+dependencies = [
+ "windows-implement 0.59.0",
+ "windows-interface 0.59.0",
+ "windows-link",
+ "windows-result 0.3.1",
+ "windows-strings 0.3.1",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0"
+dependencies = [
+ "windows-core 0.60.1",
+ "windows-link",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.57.0"
@@ -16036,6 +16080,17 @@ dependencies = [
 "syn 2.0.90",
 ]

+[[package]]
+name = "windows-implement"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.57.0"
@@ -16058,12 +16113,33 @@ dependencies = [
 "syn 2.0.90",
 ]

+[[package]]
+name = "windows-interface"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "windows-link"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"

+[[package]]
+name = "windows-numerics"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed"
+dependencies = [
+ "windows-core 0.60.1",
+ "windows-link",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -16071,7 +16147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
 dependencies = [
 "windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
 "windows-targets 0.52.6",
 ]

@@ -16093,6 +16169,15 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

+[[package]]
+name = "windows-result"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.1.0"
@@ -16103,6 +16188,15 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -16378,7 +16472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
 dependencies = [
 "bitflags 2.8.0",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -16985,7 +17079,6 @@ dependencies = [
 "repl",
 "reqwest_client",
 "rope",
- "scripting_tool",
 "search",
 "serde",
 "serde_json",
@@ -17020,7 +17113,7 @@ dependencies = [
 "vim",
 "vim_mode_setting",
 "welcome",
- "windows 0.58.0",
+ "windows 0.60.0",
 "winresource",
 "workspace",
 "zed_actions",
@@ -17070,13 +17163,6 @@ dependencies = [
 "zed_extension_api 0.1.0",
 ]

-[[package]]
-name = "zed_haskell"
-version = "0.1.3"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "zed_html"
 version = "0.1.6"
@@ -17124,13 +17210,6 @@ dependencies = [
 "zed_extension_api 0.1.0",
 ]

-[[package]]
-name = "zed_terraform"
-version = "0.1.2"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "zed_test_extension"
 version = "0.1.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -171,7 +171,6 @@ members = [

    "extensions/emmet",
    "extensions/glsl",
-    "extensions/haskell",
    "extensions/html",
    "extensions/perplexity",
    "extensions/proto",
@@ -179,7 +178,6 @@ members = [
    "extensions/ruff",
    "extensions/slash-commands-example",
    "extensions/snippets",
-    "extensions/terraform",
    "extensions/test-extension",
    "extensions/toml",
    "extensions/uiua",
@@ -371,7 +369,7 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", rev = "03c2907b44b4189aac5fdeaea331f5aab5c7072e" }
+alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -598,12 +596,12 @@ features = [
 ]

 [workspace.dependencies.windows]
-version = "0.58"
+version = "0.60"
 features = [
-    "implement",
    "Foundation_Collections",
    "Foundation_Numerics",
-    "Storage",
+    "Storage_Search",
+    "Storage_Streams",
    "System_Threading",
    "UI_StartScreen",
    "UI_ViewManagement",
@@ -624,9 +622,11 @@ features = [
    "Win32_System_Com_StructuredStorage",
    "Win32_System_Console",
    "Win32_System_DataExchange",
+    "Win32_System_IO",
    "Win32_System_LibraryLoader",
    "Win32_System_Memory",
    "Win32_System_Ole",
+    "Win32_System_Pipes",
    "Win32_System_SystemInformation",
    "Win32_System_SystemServices",
    "Win32_System_Threading",
@@ -752,5 +752,9 @@ new_ret_no_self = { level = "allow" }
 should_implement_trait = { level = "allow" }
 let_underscore_future = "allow"

+# in Rust it can be very tedious to reduce argument count without
+# running afoul of the borrow checker.
+too_many_arguments = "allow"
+
 [workspace.metadata.cargo-machete]
 ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme"]
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ Welcome to Zed, a high-performance, multiplayer code editor from the creators of

 ---

+
 ### Installation

 <a href="https://repology.org/project/zed-editor/versions">
--- a/assets/icons/file_icons/luau.svg
+++ b/assets/icons/file_icons/luau.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.36197 1.67985C5.3748 1.41534 4.36011 2.00117 4.0956 2.98834L2.17985 10.138C1.91534 11.1252 2.50117 12.1399 3.48833 12.4044L10.638 14.3202C11.6252 14.5847 12.6399 13.9988 12.9044 13.0117L14.8202 5.86197C15.0847 4.8748 14.4988 3.86012 13.5117 3.59561L6.36197 1.67985ZM10.0457 4.58266C9.77896 4.51119 9.50479 4.66948 9.43332 4.93621L8.76235 7.44028C8.69088 7.70701 8.84917 7.98118 9.11591 8.05265L11.62 8.72362C11.8867 8.79509 12.1609 8.6368 12.2324 8.37006L12.9033 5.86599C12.9748 5.59926 12.8165 5.32509 12.5498 5.25362L10.0457 4.58266Z" fill="black"/>
+</svg>
--- a/assets/icons/file_icons/wgsl.svg
+++ b/assets/icons/file_icons/wgsl.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 13L1.5 5H11.5L6.5 13Z" fill="black"/>
+<path d="M14 9H9L11.5 5L14 9Z" fill="black" fill-opacity="0.75"/>
+<path d="M9 9L14 9L11.5 13L9 9Z" fill="black" fill-opacity="0.65"/>
+<path d="M14 5L15.25 7L12.75 7L14 5Z" fill="black" fill-opacity="0.5"/>
+<path d="M14 9L12.75 7H15.25L14 9Z" fill="black" fill-opacity="0.55"/>
+</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -105,6 +105,7 @@
      "ctrl-shift-home": "editor::SelectToBeginning",
      "ctrl-shift-end": "editor::SelectToEnd",
      "ctrl-a": "editor::SelectAll",
+      "ctrl-l": "editor::SelectLine",
      "ctrl-shift-i": "editor::Format",
      // "cmd-shift-left": ["editor::SelectToBeginningOfLine", {"stop_at_soft_wraps": true, "stop_at_indent": true }],
      // "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
@@ -470,15 +471,15 @@
      "ctrl-shift-d": "editor::DuplicateLineDown",
      "ctrl-shift-j": "editor::JoinLines",
      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
+      "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
      "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
-      "ctrl-alt-left": "editor::MoveToPreviousSubwordStart", // macos sublime
-      "ctrl-alt-right": "editor::MoveToNextSubwordStart", // macos sublime
-      "alt-left": "editor::MoveToPreviousWordStart",
-      "alt-right": "editor::MoveToNextWordEnd",
-      "ctrl-l": "editor::SelectLine", // goes downwards
-      //"alt-l": "editor::SelectLineUp",
-      "alt-shift-left": "editor::SelectToPreviousSubwordStart",
-      "alt-shift-right": "editor::SelectToNextSubwordEnd"
+      "ctrl-alt-d": "editor::DeleteToNextSubwordEnd",
+      "ctrl-alt-left": "editor::MoveToPreviousSubwordStart",
+      "ctrl-alt-right": "editor::MoveToNextSubwordEnd",
+      "ctrl-alt-shift-left": "editor::SelectToPreviousSubwordStart",
+      "ctrl-alt-shift-b": "editor::SelectToPreviousSubwordStart",
+      "ctrl-alt-shift-right": "editor::SelectToNextSubwordEnd",
+      "ctrl-alt-shift-f": "editor::SelectToNextSubwordEnd"
    }
  },
  // Bindings from Atom
@@ -730,28 +731,48 @@
      "up": "menu::SelectPrevious",
      "down": "menu::SelectNext",
      "enter": "menu::Confirm",
+      "alt-y": "git::StageFile",
+      "alt-shift-y": "git::UnstageFile",
+      "ctrl-alt-y": "git::ToggleStaged",
      "space": "git::ToggleStaged",
-      "ctrl-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll",
      "tab": "git_panel::FocusEditor",
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
      "ctrl-enter": "git::Commit",
-      "alt-enter": "menu::SecondaryConfirm"
+      "alt-enter": "menu::SecondaryConfirm",
+      "backspace": "git::RestoreFile"
    }
  },
  {
    "context": "GitCommit > Editor",
    "bindings": {
+      "escape": "menu::Cancel",
      "enter": "editor::Newline",
      "ctrl-enter": "git::Commit",
      "alt-l": "git::GenerateCommitMessage"
    }
  },
+  {
+    "context": "GitPanel",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-g ctrl-g": "git::Fetch",
+      "ctrl-g up": "git::Push",
+      "ctrl-g down": "git::Pull",
+      "ctrl-g shift-up": "git::ForcePush",
+      "ctrl-g d": "git::Diff",
+      "ctrl-g backspace": "git::RestoreTrackedFiles",
+      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
+      "ctrl-space": "git::StageAll",
+      "ctrl-shift-space": "git::UnstageAll"
+    }
+  },
  {
    "context": "GitDiff > Editor",
    "bindings": {
-      "ctrl-enter": "git::Commit"
+      "ctrl-enter": "git::Commit",
+      "ctrl-space": "git::StageAll",
+      "ctrl-shift-space": "git::UnstageAll"
    }
  },
  {
@@ -766,6 +787,7 @@
      "escape": "git_panel::FocusChanges",
      "tab": "git_panel::FocusChanges",
      "shift-tab": "git_panel::FocusChanges",
+      "enter": "editor::Newline",
      "ctrl-enter": "git::Commit",
      "alt-up": "git_panel::FocusChanges",
      "alt-l": "git::GenerateCommitMessage"
@@ -839,21 +861,22 @@
      "alt-b": ["terminal::SendText", "\u001bb"],
      "alt-f": ["terminal::SendText", "\u001bf"],
      // Overrides for conflicting keybindings
+      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
+      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
+      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
+      "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
      "ctrl-shift-a": "editor::SelectAll",
      "find": "buffer_search::Deploy",
      "ctrl-shift-f": "buffer_search::Deploy",
      "ctrl-shift-l": "terminal::Clear",
      "ctrl-shift-w": "pane::CloseActiveItem",
-      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
      "up": ["terminal::SendKeystroke", "up"],
      "pageup": ["terminal::SendKeystroke", "pageup"],
      "down": ["terminal::SendKeystroke", "down"],
      "pagedown": ["terminal::SendKeystroke", "pagedown"],
      "escape": ["terminal::SendKeystroke", "escape"],
      "enter": ["terminal::SendKeystroke", "enter"],
-      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
-      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
      "shift-pageup": "terminal::ScrollPageUp",
      "shift-pagedown": "terminal::ScrollPageDown",
      "shift-up": "terminal::ScrollLineUp",
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -31,13 +31,13 @@
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
      "cmd-enter": "menu::SecondaryConfirm",
+      "cmd-escape": "menu::Cancel",
      "ctrl-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
      "escape": "menu::Cancel",
      "alt-shift-enter": "menu::Restart",
      "cmd-shift-w": "workspace::CloseWindow",
      "shift-escape": "workspace::ToggleZoom",
-      "cmd-escape": "menu::Cancel",
      "cmd-o": "workspace::Open",
      "cmd-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
      "cmd-+": ["zed::IncreaseBufferFontSize", { "persist": false }],
@@ -108,8 +108,8 @@
      "cmd-right": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "cmd-up": "editor::MoveToStartOfExcerpt",
-      "cmd-down": "editor::MoveToEndOfExcerpt",
+      "cmd-up": "editor::MoveToBeginning",
+      "cmd-down": "editor::MoveToEnd",
      "cmd-home": "editor::MoveToBeginning", // Typed via `cmd-fn-left`
      "cmd-end": "editor::MoveToEnd", // Typed via `cmd-fn-right`
      "shift-up": "editor::SelectUp",
@@ -124,8 +124,8 @@
      "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
      "ctrl-shift-up": "editor::SelectToStartOfParagraph",
      "ctrl-shift-down": "editor::SelectToEndOfParagraph",
-      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
-      "cmd-shift-down": "editor::SelectToEndOfExcerpt",
+      "cmd-shift-up": "editor::SelectToBeginning",
+      "cmd-shift-down": "editor::SelectToEnd",
      "cmd-a": "editor::SelectAll",
      "cmd-l": "editor::SelectLine",
      "cmd-shift-i": "editor::Format",
@@ -172,6 +172,16 @@
      "alt-enter": "editor::OpenSelectionsInMultibuffer"
    }
  },
+  {
+    "context": "Editor && multibuffer",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-up": "editor::MoveToStartOfExcerpt",
+      "cmd-down": "editor::MoveToStartOfNextExcerpt",
+      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
+      "cmd-shift-down": "editor::SelectToStartOfNextExcerpt"
+    }
+  },
  {
    "context": "Editor && mode == full && edit_prediction",
    "use_key_equivalents": true,
@@ -753,28 +763,25 @@
      "cmd-up": "menu::SelectFirst",
      "cmd-down": "menu::SelectLast",
      "enter": "menu::Confirm",
+      "cmd-alt-y": "git::ToggleStaged",
      "space": "git::ToggleStaged",
-      "cmd-shift-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll",
+      "cmd-y": "git::StageFile",
+      "cmd-shift-y": "git::UnstageFile",
      "alt-down": "git_panel::FocusEditor",
      "tab": "git_panel::FocusEditor",
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
-      "cmd-enter": "git::Commit"
+      "cmd-enter": "git::Commit",
+      "backspace": "git::RestoreFile"
    }
  },
  {
    "context": "GitDiff > Editor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-enter": "git::Commit"
-    }
-  },
-  {
-    "context": "AskPass > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "menu::Confirm"
+      "cmd-enter": "git::Commit",
+      "cmd-ctrl-y": "git::StageAll",
+      "cmd-ctrl-shift-y": "git::UnstageAll"
    }
  },
  {
@@ -790,11 +797,27 @@
      "alt-tab": "git::GenerateCommitMessage"
    }
  },
+  {
+    "context": "GitPanel",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-g ctrl-g": "git::Fetch",
+      "ctrl-g up": "git::Push",
+      "ctrl-g down": "git::Pull",
+      "ctrl-g shift-up": "git::ForcePush",
+      "ctrl-g d": "git::Diff",
+      "ctrl-g backspace": "git::RestoreTrackedFiles",
+      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
+      "cmd-ctrl-y": "git::StageAll",
+      "cmd-ctrl-shift-y": "git::UnstageAll"
+    }
+  },
  {
    "context": "GitCommit > Editor",
    "use_key_equivalents": true,
    "bindings": {
      "enter": "editor::Newline",
+      "escape": "menu::Cancel",
      "cmd-enter": "git::Commit",
      "alt-tab": "git::GenerateCommitMessage"
    }
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -28,10 +28,6 @@
  {
    "context": "Editor",
    "bindings": {
-      "alt-left": "editor::MoveToPreviousSubwordStart",
-      "alt-right": "editor::MoveToNextSubwordStart",
-      "alt-shift-left": "editor::SelectToPreviousSubwordStart",
-      "alt-shift-right": "editor::SelectToNextSubwordEnd",
      "ctrl-alt-up": "editor::AddSelectionAbove",
      "ctrl-alt-down": "editor::AddSelectionBelow",
      "ctrl-shift-up": "editor::MoveLineUp",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -845,7 +845,7 @@
    //    "hunk_style": "transparent"
    // 2. Show unstaged hunks with a pattern background:
    //    "hunk_style": "pattern"
-    "hunk_style": "transparent"
+    "hunk_style": "staged_border"
  },
  // Configuration for how direnv configuration should be loaded. May take 2 values:
  // 1. Load direnv configuration using `direnv export json` directly.
@@ -1300,8 +1300,7 @@
  },
  // Settings for auto-closing of JSX tags.
  "jsx_tag_auto_close": {
-    // // Whether to auto-close JSX tags.
-    // "enabled": true
+    "enabled": true
  },
  // LSP Specific settings.
  "lsp": {
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -383,6 +383,11 @@
            "font_style": null,
            "font_weight": null
          },
+          "variable.special": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
          "variant": {
            "color": "#83a598ff",
            "font_style": null,
@@ -771,6 +776,11 @@
            "font_style": null,
            "font_weight": null
          },
+          "variable.special": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
          "variant": {
            "color": "#83a598ff",
            "font_style": null,
@@ -1159,6 +1169,11 @@
            "font_style": null,
            "font_weight": null
          },
+          "variable.special": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
          "variant": {
            "color": "#83a598ff",
            "font_style": null,
@@ -1547,6 +1562,11 @@
            "font_style": null,
            "font_weight": null
          },
+          "variable.special": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
          "variant": {
            "color": "#0b6678ff",
            "font_style": null,
@@ -1935,6 +1955,11 @@
            "font_style": null,
            "font_weight": null
          },
+          "variable.special": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
          "variant": {
            "color": "#0b6678ff",
            "font_style": null,
@@ -2323,6 +2348,11 @@
            "font_style": null,
            "font_weight": null
          },
+          "variable.special": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
          "variant": {
            "color": "#0b6678ff",
            "font_style": null,
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -9,7 +9,10 @@ use gpui::{
 };
 use language::{LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId};
 use lsp::LanguageServerName;
-use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
+use project::{
+    EnvironmentErrorMessage, LanguageServerProgress, LspStoreEvent, Project,
+    ProjectEnvironmentEvent, WorktreeId,
+};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
 use ui::{prelude::*, ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip};
@@ -73,7 +76,22 @@ impl ActivityIndicator {
            })
            .detach();

-            cx.observe(&project, |_, _, cx| cx.notify()).detach();
+            cx.subscribe(
+                &project.read(cx).lsp_store(),
+                |_, _, event, cx| match event {
+                    LspStoreEvent::LanguageServerUpdate { .. } => cx.notify(),
+                    _ => {}
+                },
+            )
+            .detach();
+
+            cx.subscribe(
+                &project.read(cx).environment().clone(),
+                |_, _, event, cx| match event {
+                    ProjectEnvironmentEvent::ErrorsUpdated => cx.notify(),
+                },
+            )
+            .detach();

            if let Some(auto_updater) = auto_updater.as_ref() {
                cx.observe(auto_updater, |_, _, cx| cx.notify()).detach();
@@ -204,7 +222,7 @@ impl ActivityIndicator {
                message: error.0.clone(),
                on_click: Some(Arc::new(move |this, window, cx| {
                    this.project.update(cx, |project, cx| {
-                        project.remove_environment_error(cx, worktree_id);
+                        project.remove_environment_error(worktree_id, cx);
                    });
                    window.dispatch_action(Box::new(workspace::OpenLog), cx);
                })),
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -38,7 +38,7 @@ use language_model::{
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::{ActionVariant, CodeAction, ProjectTransaction};
+use project::{CodeAction, LspAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use rope::Rope;
 use settings::{update_settings_file, Settings, SettingsStore};
@@ -386,7 +386,6 @@ impl InlineAssistant {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn suggest_assist(
        &mut self,
        editor: &Entity<Editor>,
@@ -1674,7 +1673,6 @@ impl Focusable for PromptEditor {
 impl PromptEditor {
    const MAX_LINES: u8 = 8;

-    #[allow(clippy::too_many_arguments)]
    fn new(
        id: InlineAssistId,
        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
@@ -2333,7 +2331,6 @@ struct InlineAssist {
 }

 impl InlineAssist {
-    #[allow(clippy::too_many_arguments)]
    fn new(
        assist_id: InlineAssistId,
        group_id: InlineAssistGroupId,
@@ -3569,7 +3566,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
            Task::ready(Ok(vec![CodeAction {
                server_id: language::LanguageServerId(0),
                range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
-                lsp_action: ActionVariant::Action(Box::new(lsp::CodeAction {
+                lsp_action: LspAction::Action(Box::new(lsp::CodeAction {
                    title: "Fix with Assistant".into(),
                    ..Default::default()
                })),
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -702,7 +702,6 @@ impl Focusable for PromptEditor {
 impl PromptEditor {
    const MAX_LINES: u8 = 8;

-    #[allow(clippy::too_many_arguments)]
    fn new(
        id: TerminalInlineAssistId,
        prompt_history: VecDeque<String>,
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -59,6 +59,7 @@ prompt_library.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
 rope.workspace = true
+scripting_tool.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
@@ -81,8 +82,8 @@ zed_actions.workspace = true
 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, "features" = ["test-support"] }
+indoc.workspace = true
 language = { workspace = true, "features" = ["test-support"] }
 language_model = { workspace = true, "features" = ["test-support"] }
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-indoc.workspace = true
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -1,21 +1,20 @@
 use std::sync::Arc;

-use assistant_tool::ToolWorkingSet;
 use collections::HashMap;
 use editor::{Editor, MultiBuffer};
 use gpui::{
    list, AbsoluteLength, AnyElement, App, ClickEvent, DefiniteLength, EdgesRefinement, Empty,
    Entity, Focusable, Length, ListAlignment, ListOffset, ListState, StyleRefinement, Subscription,
-    Task, TextStyleRefinement, UnderlineStyle, WeakEntity,
+    Task, TextStyleRefinement, UnderlineStyle,
 };
 use language::{Buffer, LanguageRegistry};
 use language_model::{LanguageModelRegistry, LanguageModelToolUseId, Role};
 use markdown::{Markdown, MarkdownStyle};
+use scripting_tool::{ScriptingTool, ScriptingToolInput};
 use settings::Settings as _;
 use theme::ThemeSettings;
 use ui::{prelude::*, Disclosure, KeyBinding};
 use util::ResultExt as _;
-use workspace::Workspace;

 use crate::thread::{MessageId, RequestKind, Thread, ThreadError, ThreadEvent};
 use crate::thread_store::ThreadStore;
@@ -23,15 +22,14 @@ use crate::tool_use::{ToolUse, ToolUseStatus};
 use crate::ui::ContextPill;

 pub struct ActiveThread {
-    workspace: WeakEntity<Workspace>,
    language_registry: Arc<LanguageRegistry>,
-    tools: Arc<ToolWorkingSet>,
    thread_store: Entity<ThreadStore>,
    thread: Entity<Thread>,
    save_thread_task: Option<Task<()>>,
    messages: Vec<MessageId>,
    list_state: ListState,
    rendered_messages_by_id: HashMap<MessageId, Entity<Markdown>>,
+    rendered_scripting_tool_uses: HashMap<LanguageModelToolUseId, Entity<Markdown>>,
    editing_message: Option<(MessageId, EditMessageState)>,
    expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
    last_error: Option<ThreadError>,
@@ -46,9 +44,7 @@ impl ActiveThread {
    pub fn new(
        thread: Entity<Thread>,
        thread_store: Entity<ThreadStore>,
-        workspace: WeakEntity<Workspace>,
        language_registry: Arc<LanguageRegistry>,
-        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -58,14 +54,13 @@ impl ActiveThread {
        ];

        let mut this = Self {
-            workspace,
            language_registry,
-            tools,
            thread_store,
            thread: thread.clone(),
            save_thread_task: None,
            messages: Vec::new(),
            rendered_messages_by_id: HashMap::default(),
+            rendered_scripting_tool_uses: HashMap::default(),
            expanded_tool_uses: HashMap::default(),
            list_state: ListState::new(0, ListAlignment::Bottom, px(1024.), {
                let this = cx.entity().downgrade();
@@ -81,6 +76,16 @@ impl ActiveThread {

        for message in thread.read(cx).messages().cloned().collect::<Vec<_>>() {
            this.push_message(&message.id, message.text.clone(), window, cx);
+
+            for tool_use in thread.read(cx).scripting_tool_uses_for_message(message.id) {
+                this.render_scripting_tool_use_markdown(
+                    tool_use.id.clone(),
+                    tool_use.name.as_ref(),
+                    tool_use.input.clone(),
+                    window,
+                    cx,
+                );
+            }
        }

        this
@@ -247,9 +252,35 @@ impl ActiveThread {
        })
    }

+    /// Renders the input of a scripting tool use to Markdown.
+    ///
+    /// Does nothing if the tool use does not correspond to the scripting tool.
+    fn render_scripting_tool_use_markdown(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        tool_name: &str,
+        tool_input: serde_json::Value,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if tool_name != ScriptingTool::NAME {
+            return;
+        }
+
+        let lua_script = serde_json::from_value::<ScriptingToolInput>(tool_input)
+            .map(|input| input.lua_script)
+            .unwrap_or_default();
+
+        let lua_script =
+            self.render_markdown(format!("```lua\n{lua_script}\n```").into(), window, cx);
+
+        self.rendered_scripting_tool_uses
+            .insert(tool_use_id, lua_script);
+    }
+
    fn handle_thread_event(
        &mut self,
-        _: &Entity<Thread>,
+        _thread: &Entity<Thread>,
        event: &ThreadEvent,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -300,46 +331,28 @@ impl ActiveThread {
                cx.notify();
            }
            ThreadEvent::UsePendingTools => {
-                let pending_tool_uses = self
-                    .thread
-                    .read(cx)
-                    .pending_tool_uses()
-                    .into_iter()
-                    .filter(|tool_use| tool_use.status.is_idle())
-                    .cloned()
-                    .collect::<Vec<_>>();
-
-                for tool_use in pending_tool_uses {
-                    if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
-                        let task = tool.run(tool_use.input, self.workspace.clone(), window, cx);
-
-                        self.thread.update(cx, |thread, cx| {
-                            thread.insert_tool_output(tool_use.id.clone(), task, cx);
-                        });
-                    }
-                }
+                self.thread.update(cx, |thread, cx| {
+                    thread.use_pending_tools(cx);
+                });
            }
-            ThreadEvent::ToolFinished { .. } => {
-                let all_tools_finished = self
-                    .thread
-                    .read(cx)
-                    .pending_tool_uses()
-                    .into_iter()
-                    .all(|tool_use| tool_use.status.is_error());
-                if all_tools_finished {
+            ThreadEvent::ToolFinished {
+                pending_tool_use, ..
+            } => {
+                if let Some(tool_use) = pending_tool_use {
+                    self.render_scripting_tool_use_markdown(
+                        tool_use.id.clone(),
+                        tool_use.name.as_ref(),
+                        tool_use.input.clone(),
+                        window,
+                        cx,
+                    );
+                }
+
+                if self.thread.read(cx).all_tools_finished() {
                    let model_registry = LanguageModelRegistry::read_global(cx);
                    if let Some(model) = model_registry.active_model() {
                        self.thread.update(cx, |thread, cx| {
-                            // Insert a user message to contain the tool results.
-                            thread.insert_user_message(
-                                // TODO: Sending up a user message without any content results in the model sending back
-                                // responses that also don't have any content. We currently don't handle this case well,
-                                // so for now we provide some text to keep the model on track.
-                                "Here are the tool results.",
-                                Vec::new(),
-                                cx,
-                            );
-                            thread.send_to_model(model, RequestKind::Chat, true, cx);
+                            thread.send_tool_results_to_model(model, cx);
                        });
                    }
                }
@@ -483,12 +496,17 @@ impl ActiveThread {
            return Empty.into_any();
        };

-        let context = self.thread.read(cx).context_for_message(message_id);
-        let tool_uses = self.thread.read(cx).tool_uses_for_message(message_id);
-        let colors = cx.theme().colors();
+        let thread = self.thread.read(cx);
+
+        let context = thread.context_for_message(message_id);
+        let tool_uses = thread.tool_uses_for_message(message_id);
+        let scripting_tool_uses = thread.scripting_tool_uses_for_message(message_id);

        // Don't render user messages that are just there for returning tool results.
-        if message.role == Role::User && self.thread.read(cx).message_has_tool_results(message_id) {
+        if message.role == Role::User
+            && (thread.message_has_tool_results(message_id)
+                || thread.message_has_scripting_tool_results(message_id))
+        {
            return Empty.into_any();
        }

@@ -501,6 +519,8 @@ impl ActiveThread {
            .filter(|(id, _)| *id == message_id)
            .map(|(_, state)| state.editor.clone());

+        let colors = cx.theme().colors();
+
        let message_content = v_flex()
            .child(
                if let Some(edit_message_editor) = edit_message_editor.clone() {
@@ -636,16 +656,22 @@ impl ActiveThread {
                .id(("message-container", ix))
                .child(message_content)
                .map(|parent| {
-                    if tool_uses.is_empty() {
+                    if tool_uses.is_empty() && scripting_tool_uses.is_empty() {
                        return parent;
                    }

                    parent.child(
-                        v_flex().children(
-                            tool_uses
-                                .into_iter()
-                                .map(|tool_use| self.render_tool_use(tool_use, cx)),
-                        ),
+                        v_flex()
+                            .children(
+                                tool_uses
+                                    .into_iter()
+                                    .map(|tool_use| self.render_tool_use(tool_use, cx)),
+                            )
+                            .children(
+                                scripting_tool_uses
+                                    .into_iter()
+                                    .map(|tool_use| self.render_scripting_tool_use(tool_use, cx)),
+                            ),
                    )
                }),
            Role::System => div().id(("message-container", ix)).py_1().px_2().child(
@@ -679,8 +705,13 @@ impl ActiveThread {
                        .pl_1()
                        .pr_2()
                        .bg(cx.theme().colors().editor_foreground.opacity(0.02))
-                        .when(is_open, |element| element.border_b_1().rounded_t(px(6.)))
-                        .when(!is_open, |element| element.rounded_md())
+                        .map(|element| {
+                            if is_open {
+                                element.border_b_1().rounded_t(px(6.))
+                            } else {
+                                element.rounded_md()
+                            }
+                        })
                        .border_color(cx.theme().colors().border)
                        .child(
                            h_flex()
@@ -754,6 +785,119 @@ impl ActiveThread {
                }),
        )
    }
+
+    fn render_scripting_tool_use(
+        &self,
+        tool_use: ToolUse,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let is_open = self
+            .expanded_tool_uses
+            .get(&tool_use.id)
+            .copied()
+            .unwrap_or_default();
+
+        div().px_2p5().child(
+            v_flex()
+                .gap_1()
+                .rounded_lg()
+                .border_1()
+                .border_color(cx.theme().colors().border)
+                .child(
+                    h_flex()
+                        .justify_between()
+                        .py_0p5()
+                        .pl_1()
+                        .pr_2()
+                        .bg(cx.theme().colors().editor_foreground.opacity(0.02))
+                        .map(|element| {
+                            if is_open {
+                                element.border_b_1().rounded_t(px(6.))
+                            } else {
+                                element.rounded_md()
+                            }
+                        })
+                        .border_color(cx.theme().colors().border)
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(Disclosure::new("tool-use-disclosure", is_open).on_click(
+                                    cx.listener({
+                                        let tool_use_id = tool_use.id.clone();
+                                        move |this, _event, _window, _cx| {
+                                            let is_open = this
+                                                .expanded_tool_uses
+                                                .entry(tool_use_id.clone())
+                                                .or_insert(false);
+
+                                            *is_open = !*is_open;
+                                        }
+                                    }),
+                                ))
+                                .child(Label::new(tool_use.name)),
+                        )
+                        .child(
+                            Label::new(match tool_use.status {
+                                ToolUseStatus::Pending => "Pending",
+                                ToolUseStatus::Running => "Running",
+                                ToolUseStatus::Finished(_) => "Finished",
+                                ToolUseStatus::Error(_) => "Error",
+                            })
+                            .size(LabelSize::XSmall)
+                            .buffer_font(cx),
+                        ),
+                )
+                .map(|parent| {
+                    if !is_open {
+                        return parent;
+                    }
+
+                    let lua_script_markdown =
+                        self.rendered_scripting_tool_uses.get(&tool_use.id).cloned();
+
+                    parent.child(
+                        v_flex()
+                            .child(
+                                v_flex()
+                                    .gap_0p5()
+                                    .py_1()
+                                    .px_2p5()
+                                    .border_b_1()
+                                    .border_color(cx.theme().colors().border)
+                                    .child(Label::new("Input:"))
+                                    .map(|parent| {
+                                        if let Some(markdown) = lua_script_markdown {
+                                            parent.child(markdown)
+                                        } else {
+                                            parent.child(Label::new(
+                                                "Failed to render script input to Markdown",
+                                            ))
+                                        }
+                                    }),
+                            )
+                            .map(|parent| match tool_use.status {
+                                ToolUseStatus::Finished(output) => parent.child(
+                                    v_flex()
+                                        .gap_0p5()
+                                        .py_1()
+                                        .px_2p5()
+                                        .child(Label::new("Result:"))
+                                        .child(Label::new(output)),
+                                ),
+                                ToolUseStatus::Error(err) => parent.child(
+                                    v_flex()
+                                        .gap_0p5()
+                                        .py_1()
+                                        .px_2p5()
+                                        .child(Label::new("Error:"))
+                                        .child(Label::new(err)),
+                                ),
+                                ToolUseStatus::Pending | ToolUseStatus::Running => parent,
+                            }),
+                    )
+                }),
+        )
+    }
 }

 impl Render for ActiveThread {
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -16,6 +16,7 @@ mod terminal_inline_assistant;
 mod thread;
 mod thread_history;
 mod thread_store;
+mod tool_selector;
 mod tool_use;
 mod ui;

--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -92,7 +92,6 @@ pub struct AssistantPanel {
    context_editor: Option<Entity<ContextEditor>>,
    configuration: Option<Entity<AssistantConfiguration>>,
    configuration_subscription: Option<Subscription>,
-    tools: Arc<ToolWorkingSet>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
    history_store: Entity<HistoryStore>,
@@ -133,7 +132,7 @@ impl AssistantPanel {
            log::info!("[assistant2-debug] finished initializing ContextStore");

            workspace.update_in(&mut cx, |workspace, window, cx| {
-                cx.new(|cx| Self::new(workspace, thread_store, context_store, tools, window, cx))
+                cx.new(|cx| Self::new(workspace, thread_store, context_store, window, cx))
            })
        })
    }
@@ -142,7 +141,6 @@ impl AssistantPanel {
        workspace: &Workspace,
        thread_store: Entity<ThreadStore>,
        context_store: Entity<assistant_context_editor::ContextStore>,
-        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -168,30 +166,29 @@ impl AssistantPanel {
        let history_store =
            cx.new(|cx| HistoryStore::new(thread_store.clone(), context_store.clone(), cx));

+        let thread = cx.new(|cx| {
+            ActiveThread::new(
+                thread.clone(),
+                thread_store.clone(),
+                language_registry.clone(),
+                window,
+                cx,
+            )
+        });
+
        Self {
            active_view: ActiveView::Thread,
-            workspace: workspace.clone(),
-            project,
+            workspace,
+            project: project.clone(),
            fs: fs.clone(),
-            language_registry: language_registry.clone(),
+            language_registry,
            thread_store: thread_store.clone(),
-            thread: cx.new(|cx| {
-                ActiveThread::new(
-                    thread.clone(),
-                    thread_store.clone(),
-                    workspace,
-                    language_registry,
-                    tools.clone(),
-                    window,
-                    cx,
-                )
-            }),
+            thread,
            message_editor,
            context_store,
            context_editor: None,
            configuration: None,
            configuration_subscription: None,
-            tools,
            local_timezone: UtcOffset::from_whole_seconds(
                chrono::Local::now().offset().local_minus_utc(),
            )
@@ -246,9 +243,7 @@ impl AssistantPanel {
            ActiveThread::new(
                thread.clone(),
                self.thread_store.clone(),
-                self.workspace.clone(),
                self.language_registry.clone(),
-                self.tools.clone(),
                window,
                cx,
            )
@@ -381,9 +376,7 @@ impl AssistantPanel {
                    ActiveThread::new(
                        thread.clone(),
                        this.thread_store.clone(),
-                        this.workspace.clone(),
                        this.language_registry.clone(),
-                        this.tools.clone(),
                        window,
                        cx,
                    )
--- a/crates/assistant2/src/context_picker/fetch_context_picker.rs
+++ b/crates/assistant2/src/context_picker/fetch_context_picker.rs
@@ -167,8 +167,8 @@ impl PickerDelegate for FetchContextPickerDelegate {
        }
    }

-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
-        "Enter the URL that you would like to fetch".into()
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+        Some("Enter the URL that you would like to fetch".into())
    }

    fn selected_index(&self) -> usize {
--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -25,7 +25,7 @@ use crate::{

 pub struct ContextStrip {
    context_store: Entity<ContextStore>,
-    pub context_picker: Entity<ContextPicker>,
+    context_picker: Entity<ContextPicker>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
    focus_handle: FocusHandle,
    suggest_context_kind: SuggestContextKind,
@@ -36,7 +36,6 @@ pub struct ContextStrip {
 }

 impl ContextStrip {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        context_store: Entity<ContextStore>,
        workspace: WeakEntity<Workspace>,
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -27,7 +27,7 @@ use language::{Buffer, Point, Selection, TransactionId};
 use language_model::{report_assistant_event, LanguageModelRegistry};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::ActionVariant;
+use project::LspAction;
 use project::{CodeAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use settings::{Settings, SettingsStore};
@@ -480,7 +480,6 @@ impl InlineAssistant {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn suggest_assist(
        &mut self,
        editor: &Entity<Editor>,
@@ -1451,7 +1450,6 @@ struct InlineAssistScrollLock {
 }

 impl EditorInlineAssists {
-    #[allow(clippy::too_many_arguments)]
    fn new(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) -> Self {
        let (highlight_updates_tx, mut highlight_updates_rx) = async_watch::channel(());
        Self {
@@ -1563,7 +1561,6 @@ pub struct InlineAssist {
 }

 impl InlineAssist {
-    #[allow(clippy::too_many_arguments)]
    fn new(
        assist_id: InlineAssistId,
        group_id: InlineAssistGroupId,
@@ -1728,7 +1725,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
            Task::ready(Ok(vec![CodeAction {
                server_id: language::LanguageServerId(0),
                range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
-                lsp_action: ActionVariant::Action(Box::new(lsp::CodeAction {
+                lsp_action: LspAction::Action(Box::new(lsp::CodeAction {
                    title: "Fix with Assistant".into(),
                    ..Default::default()
                })),
--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -816,7 +816,6 @@ impl InlineAssistId {
 }

 impl PromptEditor<BufferCodegen> {
-    #[allow(clippy::too_many_arguments)]
    pub fn new_buffer(
        id: InlineAssistId,
        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
@@ -976,7 +975,6 @@ impl TerminalInlineAssistId {
 }

 impl PromptEditor<TerminalCodegen> {
-    #[allow(clippy::too_many_arguments)]
    pub fn new_terminal(
        id: TerminalInlineAssistId,
        prompt_history: VecDeque<String>,
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;

 use editor::actions::MoveUp;
 use editor::{Editor, EditorElement, EditorEvent, EditorStyle};
+use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
    Animation, AnimationExt, App, DismissEvent, Entity, Focusable, Subscription, TextStyle,
@@ -15,8 +16,8 @@ use std::time::Duration;
 use text::Bias;
 use theme::ThemeSettings;
 use ui::{
-    prelude::*, ButtonLike, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle, Switch,
-    Tooltip,
+    prelude::*, ButtonLike, Disclosure, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle,
+    Switch, Tooltip,
 };
 use vim_mode_setting::VimModeSetting;
 use workspace::Workspace;
@@ -27,6 +28,7 @@ use crate::context_store::{refresh_context_store_text, ContextStore};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::thread::{RequestKind, Thread};
 use crate::thread_store::ThreadStore;
+use crate::tool_selector::ToolSelector;
 use crate::{Chat, ChatMode, RemoveAllContext, ToggleContextPicker};

 pub struct MessageEditor {
@@ -38,7 +40,9 @@ pub struct MessageEditor {
    inline_context_picker: Entity<ContextPicker>,
    inline_context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
    model_selector: Entity<AssistantModelSelector>,
+    tool_selector: Entity<ToolSelector>,
    use_tools: bool,
+    edits_expanded: bool,
    _subscriptions: Vec<Subscription>,
 }

@@ -51,6 +55,7 @@ impl MessageEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
+        let tools = thread.read(cx).tools().clone();
        let context_store = cx.new(|_cx| ContextStore::new(workspace.clone()));
        let context_picker_menu_handle = PopoverMenuHandle::default();
        let inline_context_picker_menu_handle = PopoverMenuHandle::default();
@@ -116,7 +121,9 @@ impl MessageEditor {
                    cx,
                )
            }),
+            tool_selector: cx.new(|cx| ToolSelector::new(tools, cx)),
            use_tools: false,
+            edits_expanded: false,
            _subscriptions: subscriptions,
        }
    }
@@ -303,6 +310,9 @@ impl Render for MessageEditor {
            px(64.)
        };

+        let changed_buffers = self.thread.read(cx).scripting_changed_buffers(cx);
+        let changed_buffers_count = changed_buffers.len();
+
        v_flex()
            .size_full()
            .when(is_streaming_completion, |parent| {
@@ -363,6 +373,109 @@ impl Render for MessageEditor {
                    ),
                )
            })
+            .when(changed_buffers_count > 0, |parent| {
+                parent.child(
+                    v_flex()
+                        .mx_2()
+                        .bg(cx.theme().colors().element_background)
+                        .border_1()
+                        .border_b_0()
+                        .border_color(cx.theme().colors().border)
+                        .rounded_t_md()
+                        .child(
+                            h_flex()
+                                .gap_2()
+                                .p_2()
+                                .child(
+                                    Disclosure::new("edits-disclosure", self.edits_expanded)
+                                        .on_click(cx.listener(|this, _ev, _window, cx| {
+                                            this.edits_expanded = !this.edits_expanded;
+                                            cx.notify();
+                                        })),
+                                )
+                                .child(
+                                    Label::new("Edits")
+                                        .size(LabelSize::XSmall)
+                                        .color(Color::Muted),
+                                )
+                                .child(Label::new("•").size(LabelSize::XSmall).color(Color::Muted))
+                                .child(
+                                    Label::new(format!(
+                                        "{} {}",
+                                        changed_buffers_count,
+                                        if changed_buffers_count == 1 {
+                                            "file"
+                                        } else {
+                                            "files"
+                                        }
+                                    ))
+                                    .size(LabelSize::XSmall)
+                                    .color(Color::Muted),
+                                ),
+                        )
+                        .when(self.edits_expanded, |parent| {
+                            parent.child(
+                                v_flex().bg(cx.theme().colors().editor_background).children(
+                                    changed_buffers.enumerate().flat_map(|(index, buffer)| {
+                                        let file = buffer.read(cx).file()?;
+                                        let path = file.path();
+
+                                        let parent_label = path.parent().and_then(|parent| {
+                                            let parent_str = parent.to_string_lossy();
+
+                                            if parent_str.is_empty() {
+                                                None
+                                            } else {
+                                                Some(
+                                                    Label::new(format!(
+                                                        "{}{}",
+                                                        parent_str,
+                                                        std::path::MAIN_SEPARATOR_STR
+                                                    ))
+                                                    .color(Color::Muted)
+                                                    .size(LabelSize::Small),
+                                                )
+                                            }
+                                        });
+
+                                        let name_label = path.file_name().map(|name| {
+                                            Label::new(name.to_string_lossy().to_string())
+                                                .size(LabelSize::Small)
+                                        });
+
+                                        let file_icon = FileIcons::get_icon(&path, cx)
+                                            .map(Icon::from_path)
+                                            .unwrap_or_else(|| Icon::new(IconName::File));
+
+                                        let element = div()
+                                            .p_2()
+                                            .when(index + 1 < changed_buffers_count, |parent| {
+                                                parent
+                                                    .border_color(cx.theme().colors().border)
+                                                    .border_b_1()
+                                            })
+                                            .child(
+                                                h_flex()
+                                                    .gap_2()
+                                                    .child(file_icon)
+                                                    .child(
+                                                        // TODO: handle overflow
+                                                        h_flex()
+                                                            .children(parent_label)
+                                                            .children(name_label),
+                                                    )
+                                                    // TODO: show lines changed
+                                                    .child(Label::new("+").color(Color::Created))
+                                                    .child(Label::new("-").color(Color::Deleted)),
+                                            );
+
+                                        Some(element)
+                                    }),
+                                ),
+                            )
+                        }),
+                )
+            })
            .child(
                v_flex()
                    .key_context("MessageEditor")
@@ -429,23 +542,25 @@ impl Render for MessageEditor {
                                h_flex()
                                    .justify_between()
                                    .child(
-                                        Switch::new("use-tools", self.use_tools.into())
-                                            .label("Tools")
-                                            .on_click(cx.listener(
-                                                |this, selection, _window, _cx| {
-                                                    this.use_tools = match selection {
-                                                        ToggleState::Selected => true,
-                                                        ToggleState::Unselected
-                                                        | ToggleState::Indeterminate => false,
-                                                    };
-                                                },
-                                            ))
-                                            .key_binding(KeyBinding::for_action_in(
-                                                &ChatMode,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )),
+                                        h_flex().gap_2().child(self.tool_selector.clone()).child(
+                                            Switch::new("use-tools", self.use_tools.into())
+                                                .label("Tools")
+                                                .on_click(cx.listener(
+                                                    |this, selection, _window, _cx| {
+                                                        this.use_tools = match selection {
+                                                            ToggleState::Selected => true,
+                                                            ToggleState::Unselected
+                                                            | ToggleState::Indeterminate => false,
+                                                        };
+                                                    },
+                                                ))
+                                                .key_binding(KeyBinding::for_action_in(
+                                                    &ChatMode,
+                                                    &focus_handle,
+                                                    window,
+                                                    cx,
+                                                )),
+                                        ),
                                    )
                                    .child(
                                        h_flex().gap_1().child(self.model_selector.clone()).child(
--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
@@ -5,13 +5,15 @@ use assistant_tool::ToolWorkingSet;
 use chrono::{DateTime, Utc};
 use collections::{BTreeMap, HashMap, HashSet};
 use futures::StreamExt as _;
-use gpui::{App, Context, EventEmitter, SharedString, Task};
+use gpui::{App, AppContext, Context, Entity, EventEmitter, SharedString, Task};
 use language_model::{
    LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
    Role, StopReason,
 };
+use project::Project;
+use scripting_tool::{ScriptingSession, ScriptingTool};
 use serde::{Deserialize, Serialize};
 use util::{post_inc, TryFutureExt as _};
 use uuid::Uuid;
@@ -71,12 +73,21 @@ pub struct Thread {
    context_by_message: HashMap<MessageId, Vec<ContextId>>,
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
+    project: Entity<Project>,
    tools: Arc<ToolWorkingSet>,
    tool_use: ToolUseState,
+    scripting_session: Entity<ScriptingSession>,
+    scripting_tool_use: ToolUseState,
 }

 impl Thread {
-    pub fn new(tools: Arc<ToolWorkingSet>, _cx: &mut Context<Self>) -> Self {
+    pub fn new(
+        project: Entity<Project>,
+        tools: Arc<ToolWorkingSet>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let scripting_session = cx.new(|cx| ScriptingSession::new(project.clone(), cx));
+
        Self {
            id: ThreadId::new(),
            updated_at: Utc::now(),
@@ -88,16 +99,20 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
+            project,
            tools,
            tool_use: ToolUseState::new(),
+            scripting_session,
+            scripting_tool_use: ToolUseState::new(),
        }
    }

    pub fn from_saved(
        id: ThreadId,
        saved: SavedThread,
+        project: Entity<Project>,
        tools: Arc<ToolWorkingSet>,
-        _cx: &mut Context<Self>,
+        cx: &mut Context<Self>,
    ) -> Self {
        let next_message_id = MessageId(
            saved
@@ -106,7 +121,11 @@ impl Thread {
                .map(|message| message.id.0 + 1)
                .unwrap_or(0),
        );
-        let tool_use = ToolUseState::from_saved_messages(&saved.messages);
+        let tool_use =
+            ToolUseState::from_saved_messages(&saved.messages, |name| name != ScriptingTool::NAME);
+        let scripting_tool_use =
+            ToolUseState::from_saved_messages(&saved.messages, |name| name == ScriptingTool::NAME);
+        let scripting_session = cx.new(|cx| ScriptingSession::new(project.clone(), cx));

        Self {
            id,
@@ -127,8 +146,11 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
+            project,
            tools,
            tool_use,
+            scripting_session,
+            scripting_tool_use,
        }
    }

@@ -189,33 +211,65 @@ impl Thread {
        )
    }

-    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
-        self.tool_use.pending_tool_uses()
+    /// Returns whether all of the tool uses have finished running.
+    pub fn all_tools_finished(&self) -> bool {
+        let mut all_pending_tool_uses = self
+            .tool_use
+            .pending_tool_uses()
+            .into_iter()
+            .chain(self.scripting_tool_use.pending_tool_uses());
+
+        // If the only pending tool uses left are the ones with errors, then that means that we've finished running all
+        // of the pending tools.
+        all_pending_tool_uses.all(|tool_use| tool_use.status.is_error())
    }

    pub fn tool_uses_for_message(&self, id: MessageId) -> Vec<ToolUse> {
        self.tool_use.tool_uses_for_message(id)
    }

+    pub fn scripting_tool_uses_for_message(&self, id: MessageId) -> Vec<ToolUse> {
+        self.scripting_tool_use.tool_uses_for_message(id)
+    }
+
    pub fn tool_results_for_message(&self, id: MessageId) -> Vec<&LanguageModelToolResult> {
        self.tool_use.tool_results_for_message(id)
    }

+    pub fn scripting_tool_results_for_message(
+        &self,
+        id: MessageId,
+    ) -> Vec<&LanguageModelToolResult> {
+        self.scripting_tool_use.tool_results_for_message(id)
+    }
+
+    pub fn scripting_changed_buffers<'a>(
+        &self,
+        cx: &'a App,
+    ) -> impl ExactSizeIterator<Item = &'a Entity<language::Buffer>> {
+        self.scripting_session.read(cx).changed_buffers()
+    }
+
    pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
        self.tool_use.message_has_tool_results(message_id)
    }

+    pub fn message_has_scripting_tool_results(&self, message_id: MessageId) -> bool {
+        self.scripting_tool_use.message_has_tool_results(message_id)
+    }
+
    pub fn insert_user_message(
        &mut self,
        text: impl Into<String>,
        context: Vec<ContextSnapshot>,
        cx: &mut Context<Self>,
-    ) {
+    ) -> MessageId {
        let message_id = self.insert_message(Role::User, text, cx);
        let context_ids = context.iter().map(|context| context.id).collect::<Vec<_>>();
        self.context
            .extend(context.into_iter().map(|context| (context.id, context)));
        self.context_by_message.insert(message_id, context_ids);
+        message_id
    }

    pub fn insert_message(
@@ -294,16 +348,22 @@ impl Thread {
        let mut request = self.to_completion_request(request_kind, cx);

        if use_tools {
-            request.tools = self
-                .tools()
-                .tools(cx)
-                .into_iter()
-                .map(|tool| LanguageModelRequestTool {
+            let mut tools = Vec::new();
+            tools.push(LanguageModelRequestTool {
+                name: ScriptingTool::NAME.into(),
+                description: ScriptingTool::DESCRIPTION.into(),
+                input_schema: ScriptingTool::input_schema(),
+            });
+
+            tools.extend(self.tools().enabled_tools(cx).into_iter().map(|tool| {
+                LanguageModelRequestTool {
                    name: tool.name(),
                    description: tool.description(),
                    input_schema: tool.input_schema(),
-                })
-                .collect();
+                }
+            }));
+
+            request.tools = tools;
        }

        self.stream_completion(request, model, cx);
@@ -333,10 +393,13 @@ impl Thread {
                content: Vec::new(),
                cache: false,
            };
+
            match request_kind {
                RequestKind::Chat => {
                    self.tool_use
                        .attach_tool_results(message.id, &mut request_message);
+                    self.scripting_tool_use
+                        .attach_tool_results(message.id, &mut request_message);
                }
                RequestKind::Summarize => {
                    // We don't care about tool use during summarization.
@@ -353,11 +416,13 @@ impl Thread {
                RequestKind::Chat => {
                    self.tool_use
                        .attach_tool_uses(message.id, &mut request_message);
+                    self.scripting_tool_use
+                        .attach_tool_uses(message.id, &mut request_message);
                }
                RequestKind::Summarize => {
                    // We don't care about tool use during summarization.
                }
-            }
+            };

            request.messages.push(request_message);
        }
@@ -421,7 +486,7 @@ impl Thread {
                                        // Importantly: We do *not* want to emit a `StreamedAssistantText` event here, as it
                                        // will result in duplicating the text of the chunk in the rendered Markdown.
                                        thread.insert_message(Role::Assistant, chunk, cx);
-                                    }
+                                    };
                                }
                            }
                            LanguageModelCompletionEvent::ToolUse(tool_use) => {
@@ -430,9 +495,15 @@ impl Thread {
                                    .iter()
                                    .rfind(|message| message.role == Role::Assistant)
                                {
-                                    thread
-                                        .tool_use
-                                        .request_tool_use(last_assistant_message.id, tool_use);
+                                    if tool_use.name.as_ref() == ScriptingTool::NAME {
+                                        thread
+                                            .scripting_tool_use
+                                            .request_tool_use(last_assistant_message.id, tool_use);
+                                    } else {
+                                        thread
+                                            .tool_use
+                                            .request_tool_use(last_assistant_message.id, tool_use);
+                                    }
                                }
                            }
                        }
@@ -550,6 +621,63 @@ impl Thread {
        });
    }

+    pub fn use_pending_tools(&mut self, cx: &mut Context<Self>) {
+        let pending_tool_uses = self
+            .tool_use
+            .pending_tool_uses()
+            .into_iter()
+            .filter(|tool_use| tool_use.status.is_idle())
+            .cloned()
+            .collect::<Vec<_>>();
+
+        for tool_use in pending_tool_uses {
+            if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
+                let task = tool.run(tool_use.input, self.project.clone(), cx);
+
+                self.insert_tool_output(tool_use.id.clone(), task, cx);
+            }
+        }
+
+        let pending_scripting_tool_uses = self
+            .scripting_tool_use
+            .pending_tool_uses()
+            .into_iter()
+            .filter(|tool_use| tool_use.status.is_idle())
+            .cloned()
+            .collect::<Vec<_>>();
+
+        for scripting_tool_use in pending_scripting_tool_uses {
+            let task = match ScriptingTool::deserialize_input(scripting_tool_use.input) {
+                Err(err) => Task::ready(Err(err.into())),
+                Ok(input) => {
+                    let (script_id, script_task) =
+                        self.scripting_session.update(cx, move |session, cx| {
+                            session.run_script(input.lua_script, cx)
+                        });
+
+                    let session = self.scripting_session.clone();
+                    cx.spawn(|_, cx| async move {
+                        script_task.await;
+
+                        let message = session.read_with(&cx, |session, _cx| {
+                            // Using a id to get the script output seems impractical.
+                            // Why not just include it in the Task result?
+                            // This is because we'll later report the script state as it runs,
+                            session
+                                .get(script_id)
+                                .output_message_for_llm()
+                                .expect("Script shouldn't still be running")
+                        })?;
+
+                        Ok(message)
+                    })
+                }
+            };
+
+            self.insert_scripting_tool_output(scripting_tool_use.id.clone(), task, cx);
+        }
+    }
+
    pub fn insert_tool_output(
        &mut self,
        tool_use_id: LanguageModelToolUseId,
@@ -562,11 +690,14 @@ impl Thread {
                let output = output.await;
                thread
                    .update(&mut cx, |thread, cx| {
-                        thread
+                        let pending_tool_use = thread
                            .tool_use
                            .insert_tool_output(tool_use_id.clone(), output);

-                        cx.emit(ThreadEvent::ToolFinished { tool_use_id });
+                        cx.emit(ThreadEvent::ToolFinished {
+                            tool_use_id,
+                            pending_tool_use,
+                        });
                    })
                    .ok();
            }
@@ -576,6 +707,52 @@ impl Thread {
            .run_pending_tool(tool_use_id, insert_output_task);
    }

+    pub fn insert_scripting_tool_output(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        output: Task<Result<String>>,
+        cx: &mut Context<Self>,
+    ) {
+        let insert_output_task = cx.spawn(|thread, mut cx| {
+            let tool_use_id = tool_use_id.clone();
+            async move {
+                let output = output.await;
+                thread
+                    .update(&mut cx, |thread, cx| {
+                        let pending_tool_use = thread
+                            .scripting_tool_use
+                            .insert_tool_output(tool_use_id.clone(), output);
+
+                        cx.emit(ThreadEvent::ToolFinished {
+                            tool_use_id,
+                            pending_tool_use,
+                        });
+                    })
+                    .ok();
+            }
+        });
+
+        self.scripting_tool_use
+            .run_pending_tool(tool_use_id, insert_output_task);
+    }
+
+    pub fn send_tool_results_to_model(
+        &mut self,
+        model: Arc<dyn LanguageModel>,
+        cx: &mut Context<Self>,
+    ) {
+        // Insert a user message to contain the tool results.
+        self.insert_user_message(
+            // TODO: Sending up a user message without any content results in the model sending back
+            // responses that also don't have any content. We currently don't handle this case well,
+            // so for now we provide some text to keep the model on track.
+            "Here are the tool results.",
+            Vec::new(),
+            cx,
+        );
+        self.send_to_model(model, RequestKind::Chat, true, cx);
+    }
+
    /// Cancels the last pending completion, if there are any pending.
    ///
    /// Returns whether a completion was canceled.
@@ -608,6 +785,8 @@ pub enum ThreadEvent {
    ToolFinished {
        #[allow(unused)]
        tool_use_id: LanguageModelToolUseId,
+        /// The pending tool use that corresponds to this tool.
+        pending_tool_use: Option<PendingToolUse>,
    },
 }

--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -26,7 +26,6 @@ pub fn init(cx: &mut App) {
 }

 pub struct ThreadStore {
-    #[allow(unused)]
    project: Entity<Project>,
    tools: Arc<ToolWorkingSet>,
    context_server_manager: Entity<ContextServerManager>,
@@ -78,7 +77,7 @@ impl ThreadStore {
    }

    pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Entity<Thread> {
-        cx.new(|cx| Thread::new(self.tools.clone(), cx))
+        cx.new(|cx| Thread::new(self.project.clone(), self.tools.clone(), cx))
    }

    pub fn open_thread(
@@ -96,7 +95,15 @@ impl ThreadStore {
                .ok_or_else(|| anyhow!("no thread found with ID: {id:?}"))?;

            this.update(&mut cx, |this, cx| {
-                cx.new(|cx| Thread::from_saved(id.clone(), thread, this.tools.clone(), cx))
+                cx.new(|cx| {
+                    Thread::from_saved(
+                        id.clone(),
+                        thread,
+                        this.project.clone(),
+                        this.tools.clone(),
+                        cx,
+                    )
+                })
            })
        })
    }
@@ -109,28 +116,35 @@ impl ThreadStore {
                updated_at: thread.updated_at(),
                messages: thread
                    .messages()
-                    .map(|message| SavedMessage {
-                        id: message.id,
-                        role: message.role,
-                        text: message.text.clone(),
-                        tool_uses: thread
+                    .map(|message| {
+                        let all_tool_uses = thread
                            .tool_uses_for_message(message.id)
                            .into_iter()
+                            .chain(thread.scripting_tool_uses_for_message(message.id))
                            .map(|tool_use| SavedToolUse {
                                id: tool_use.id,
                                name: tool_use.name,
                                input: tool_use.input,
                            })
-                            .collect(),
-                        tool_results: thread
+                            .collect();
+                        let all_tool_results = thread
                            .tool_results_for_message(message.id)
                            .into_iter()
+                            .chain(thread.scripting_tool_results_for_message(message.id))
                            .map(|tool_result| SavedToolResult {
                                tool_use_id: tool_result.tool_use_id.clone(),
                                is_error: tool_result.is_error,
                                content: tool_result.content.clone(),
                            })
-                            .collect(),
+                            .collect();
+
+                        SavedMessage {
+                            id: message.id,
+                            role: message.role,
+                            text: message.text.clone(),
+                            tool_uses: all_tool_uses,
+                            tool_results: all_tool_results,
+                        }
                    })
                    .collect(),
            };
--- a/crates/assistant2/src/tool_selector.rs
+++ b/crates/assistant2/src/tool_selector.rs
@@ -0,0 +1,70 @@
+use std::sync::Arc;
+
+use assistant_tool::{ToolSource, ToolWorkingSet};
+use gpui::Entity;
+use ui::{prelude::*, ContextMenu, IconButtonShape, PopoverMenu, Tooltip};
+
+pub struct ToolSelector {
+    tools: Arc<ToolWorkingSet>,
+}
+
+impl ToolSelector {
+    pub fn new(tools: Arc<ToolWorkingSet>, _cx: &mut Context<Self>) -> Self {
+        Self { tools }
+    }
+
+    fn build_context_menu(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<ContextMenu> {
+        ContextMenu::build(window, cx, |mut menu, _window, cx| {
+            let tools_by_source = self.tools.tools_by_source(cx);
+
+            for (source, tools) in tools_by_source {
+                menu = match source {
+                    ToolSource::Native => menu.header("Zed"),
+                    ToolSource::ContextServer { id } => menu.separator().header(id),
+                };
+
+                for tool in tools {
+                    let source = tool.source();
+                    let name = tool.name().into();
+                    let is_enabled = self.tools.is_enabled(&source, &name);
+
+                    menu =
+                        menu.toggleable_entry(tool.name(), is_enabled, IconPosition::End, None, {
+                            let tools = self.tools.clone();
+                            move |_window, _cx| {
+                                if is_enabled {
+                                    tools.disable(source.clone(), &[name.clone()]);
+                                } else {
+                                    tools.enable(source.clone(), &[name.clone()]);
+                                }
+                            }
+                        });
+                }
+            }
+
+            menu
+        })
+    }
+}
+
+impl Render for ToolSelector {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<'_, Self>) -> impl IntoElement {
+        let this = cx.entity().clone();
+        PopoverMenu::new("tool-selector")
+            .menu(move |window, cx| {
+                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
+            })
+            .trigger_with_tooltip(
+                IconButton::new("tool-selector-button", IconName::SettingsAlt)
+                    .shape(IconButtonShape::Square)
+                    .icon_size(IconSize::Small)
+                    .icon_color(Color::Muted),
+                Tooltip::text("Customize Tools"),
+            )
+            .anchor(gpui::Corner::BottomLeft)
+    }
+}
--- a/crates/assistant2/src/tool_use.rs
+++ b/crates/assistant2/src/tool_use.rs
@@ -46,25 +46,39 @@ impl ToolUseState {
        }
    }

-    pub fn from_saved_messages(messages: &[SavedMessage]) -> Self {
+    /// Constructs a [`ToolUseState`] from the given list of [`SavedMessage`]s.
+    ///
+    /// Accepts a function to filter the tools that should be used to populate the state.
+    pub fn from_saved_messages(
+        messages: &[SavedMessage],
+        mut filter_by_tool_name: impl FnMut(&str) -> bool,
+    ) -> Self {
        let mut this = Self::new();
+        let mut tool_names_by_id = HashMap::default();

        for message in messages {
            match message.role {
                Role::Assistant => {
                    if !message.tool_uses.is_empty() {
-                        this.tool_uses_by_assistant_message.insert(
-                            message.id,
-                            message
-                                .tool_uses
+                        let tool_uses = message
+                            .tool_uses
+                            .iter()
+                            .filter(|tool_use| (filter_by_tool_name)(tool_use.name.as_ref()))
+                            .map(|tool_use| LanguageModelToolUse {
+                                id: tool_use.id.clone(),
+                                name: tool_use.name.clone().into(),
+                                input: tool_use.input.clone(),
+                            })
+                            .collect::<Vec<_>>();
+
+                        tool_names_by_id.extend(
+                            tool_uses
                                .iter()
-                                .map(|tool_use| LanguageModelToolUse {
-                                    id: tool_use.id.clone(),
-                                    name: tool_use.name.clone().into(),
-                                    input: tool_use.input.clone(),
-                                })
-                                .collect(),
+                                .map(|tool_use| (tool_use.id.clone(), tool_use.name.clone())),
                        );
+
+                        this.tool_uses_by_assistant_message
+                            .insert(message.id, tool_uses);
                    }
                }
                Role::User => {
@@ -76,6 +90,14 @@ impl ToolUseState {

                        for tool_result in &message.tool_results {
                            let tool_use_id = tool_result.tool_use_id.clone();
+                            let Some(tool_use) = tool_names_by_id.get(&tool_use_id) else {
+                                log::warn!("no tool name found for tool use: {tool_use_id:?}");
+                                continue;
+                            };
+
+                            if !(filter_by_tool_name)(tool_use.as_ref()) {
+                                continue;
+                            }

                            tool_uses_by_user_message.push(tool_use_id.clone());
                            this.tool_results.insert(
@@ -202,7 +224,7 @@ impl ToolUseState {
        &mut self,
        tool_use_id: LanguageModelToolUseId,
        output: Result<String>,
-    ) {
+    ) -> Option<PendingToolUse> {
        match output {
            Ok(output) => {
                self.tool_results.insert(
@@ -213,7 +235,7 @@ impl ToolUseState {
                        is_error: false,
                    },
                );
-                self.pending_tool_uses_by_id.remove(&tool_use_id);
+                self.pending_tool_uses_by_id.remove(&tool_use_id)
            }
            Err(err) => {
                self.tool_results.insert(
@@ -228,6 +250,8 @@ impl ToolUseState {
                if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
                    tool_use.status = PendingToolUseStatus::Error(err.to_string().into());
                }
+
+                self.pending_tool_uses_by_id.get(&tool_use_id).cloned()
            }
        }
    }
@@ -267,6 +291,7 @@ impl ToolUseState {
 pub struct PendingToolUse {
    pub id: LanguageModelToolUseId,
    /// The ID of the Assistant message in which the tool use was requested.
+    #[allow(unused)]
    pub assistant_message_id: MessageId,
    pub name: Arc<str>,
    pub input: serde_json::Value,
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -647,7 +647,6 @@ impl AssistantContext {
        )
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        id: ContextId,
        replica_id: ReplicaId,
@@ -768,7 +767,6 @@ impl AssistantContext {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn deserialize(
        saved_context: SavedContext,
        path: PathBuf,
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -535,7 +535,6 @@ impl ContextEditor {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn run_command(
        &mut self,
        command_range: Range<language::Anchor>,
@@ -2057,7 +2056,6 @@ impl ContextEditor {
            .unwrap_or_else(|| Cow::Borrowed(DEFAULT_TAB_TITLE))
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_patch_block(
        &mut self,
        range: Range<text::Anchor>,
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -104,49 +104,53 @@ impl ContextStore {
            const CONTEXT_WATCH_DURATION: Duration = Duration::from_millis(100);
            let (mut events, _) = fs.watch(contexts_dir(), CONTEXT_WATCH_DURATION).await;

-            let this = cx.new(|cx: &mut Context<Self>| {
-                let context_server_factory_registry =
-                    ContextServerFactoryRegistry::default_global(cx);
-                let context_server_manager = cx.new(|cx| {
-                    ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
-                });
-                let mut this = Self {
-                    contexts: Vec::new(),
-                    contexts_metadata: Vec::new(),
-                    context_server_manager,
-                    context_server_slash_command_ids: HashMap::default(),
-                    host_contexts: Vec::new(),
-                    fs,
-                    languages,
-                    slash_commands,
-                    telemetry,
-                    _watch_updates: cx.spawn(|this, mut cx| {
-                        async move {
-                            while events.next().await.is_some() {
-                                this.update(&mut cx, |this, cx| this.reload(cx))?
-                                    .await
-                                    .log_err();
+            let this =
+                cx.new(|cx: &mut Context<Self>| {
+                    let context_server_factory_registry =
+                        ContextServerFactoryRegistry::default_global(cx);
+                    let context_server_manager = cx.new(|cx| {
+                        ContextServerManager::new(
+                            context_server_factory_registry,
+                            project.clone(),
+                            cx,
+                        )
+                    });
+                    let mut this = Self {
+                        contexts: Vec::new(),
+                        contexts_metadata: Vec::new(),
+                        context_server_manager,
+                        context_server_slash_command_ids: HashMap::default(),
+                        host_contexts: Vec::new(),
+                        fs,
+                        languages,
+                        slash_commands,
+                        telemetry,
+                        _watch_updates: cx.spawn(|this, mut cx| {
+                            async move {
+                                while events.next().await.is_some() {
+                                    this.update(&mut cx, |this, cx| this.reload(cx))?
+                                        .await
+                                        .log_err();
+                                }
+                                anyhow::Ok(())
                            }
-                            anyhow::Ok(())
-                        }
-                        .log_err()
-                    }),
-                    client_subscription: None,
-                    _project_subscriptions: vec![
-                        cx.observe(&project, Self::handle_project_changed),
-                        cx.subscribe(&project, Self::handle_project_event),
-                    ],
-                    project_is_shared: false,
-                    client: project.read(cx).client(),
-                    project: project.clone(),
-                    prompt_builder,
-                };
-                this.handle_project_changed(project.clone(), cx);
-                this.synchronize_contexts(cx);
-                this.register_context_server_handlers(cx);
-                this.reload(cx).detach_and_log_err(cx);
-                this
-            })?;
+                            .log_err()
+                        }),
+                        client_subscription: None,
+                        _project_subscriptions: vec![
+                            cx.subscribe(&project, Self::handle_project_event)
+                        ],
+                        project_is_shared: false,
+                        client: project.read(cx).client(),
+                        project: project.clone(),
+                        prompt_builder,
+                    };
+                    this.handle_project_shared(project.clone(), cx);
+                    this.synchronize_contexts(cx);
+                    this.register_context_server_handlers(cx);
+                    this.reload(cx).detach_and_log_err(cx);
+                    this
+                })?;

            Ok(this)
        })
@@ -288,7 +292,7 @@ impl ContextStore {
        })?
    }

-    fn handle_project_changed(&mut self, _: Entity<Project>, cx: &mut Context<Self>) {
+    fn handle_project_shared(&mut self, _: Entity<Project>, cx: &mut Context<Self>) {
        let is_shared = self.project.read(cx).is_shared();
        let was_shared = mem::replace(&mut self.project_is_shared, is_shared);
        if is_shared == was_shared {
@@ -318,11 +322,14 @@ impl ContextStore {

    fn handle_project_event(
        &mut self,
-        _: Entity<Project>,
+        project: Entity<Project>,
        event: &project::Event,
        cx: &mut Context<Self>,
    ) {
        match event {
+            project::Event::RemoteIdChanged(_) => {
+                self.handle_project_shared(project, cx);
+            }
            project::Event::Reshared => {
                self.advertise_contexts(cx);
            }
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -5,9 +5,9 @@ use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWor
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
-use language::{Anchor, Buffer, LanguageServerId, ToPoint};
+use language::{Anchor, Buffer, ToPoint};
 use parking_lot::Mutex;
-use project::{lsp_store::CompletionDocumentation, CompletionIntent};
+use project::{lsp_store::CompletionDocumentation, CompletionIntent, CompletionSource};
 use rope::Point;
 use std::{
    cell::RefCell,
@@ -125,10 +125,8 @@ impl SlashCommandCompletionProvider {
                            )),
                            new_text,
                            label: command.label(cx),
-                            server_id: LanguageServerId(0),
-                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
+                            source: CompletionSource::Custom,
                        })
                    })
                    .collect()
@@ -136,7 +134,6 @@ impl SlashCommandCompletionProvider {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    fn complete_command_argument(
        &self,
        command_name: &str,
@@ -225,10 +222,8 @@ impl SlashCommandCompletionProvider {
                            label: new_argument.label,
                            new_text,
                            documentation: None,
-                            server_id: LanguageServerId(0),
-                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
+                            source: CompletionSource::Custom,
                        }
                    })
                    .collect())
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ b/crates/assistant_slash_command/src/assistant_slash_command.rs
@@ -88,7 +88,6 @@ pub trait SlashCommand: 'static + Send + Sync {
    fn accepts_arguments(&self) -> bool {
        self.requires_argument()
    }
-    #[allow(clippy::too_many_arguments)]
    fn run(
        self: Arc<Self>,
        arguments: &[String],
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -17,6 +17,6 @@ collections.workspace = true
 derive_more.workspace = true
 gpui.workspace = true
 parking_lot.workspace = true
+project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-workspace.workspace = true
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -4,8 +4,8 @@ mod tool_working_set;
 use std::sync::Arc;

 use anyhow::Result;
-use gpui::{App, Task, WeakEntity, Window};
-use workspace::Workspace;
+use gpui::{App, Entity, SharedString, Task};
+use project::Project;

 pub use crate::tool_registry::*;
 pub use crate::tool_working_set::*;
@@ -14,6 +14,14 @@ pub fn init(cx: &mut App) {
    ToolRegistry::default_global(cx);
 }

+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
+pub enum ToolSource {
+    /// A native tool built-in to Zed.
+    Native,
+    /// A tool provided by a context server.
+    ContextServer { id: SharedString },
+}
+
 /// A tool that can be used by a language model.
 pub trait Tool: 'static + Send + Sync {
    /// Returns the name of the tool.
@@ -22,6 +30,11 @@ pub trait Tool: 'static + Send + Sync {
    /// Returns the description of the tool.
    fn description(&self) -> String;

+    /// Returns the source of the tool.
+    fn source(&self) -> ToolSource {
+        ToolSource::Native
+    }
+
    /// Returns the JSON schema that describes the tool's input.
    fn input_schema(&self) -> serde_json::Value {
        serde_json::Value::Object(serde_json::Map::default())
@@ -31,8 +44,7 @@ pub trait Tool: 'static + Send + Sync {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
+        project: Entity<Project>,
        cx: &mut App,
    ) -> Task<Result<String>>;
 }
--- a/crates/assistant_tool/src/tool_working_set.rs
+++ b/crates/assistant_tool/src/tool_working_set.rs
@@ -1,10 +1,10 @@
 use std::sync::Arc;

-use collections::HashMap;
+use collections::{HashMap, HashSet, IndexMap};
 use gpui::App;
 use parking_lot::Mutex;

-use crate::{Tool, ToolRegistry};
+use crate::{Tool, ToolRegistry, ToolSource};

 #[derive(Copy, Clone, PartialEq, Eq, Hash, Default)]
 pub struct ToolId(usize);
@@ -19,6 +19,7 @@ pub struct ToolWorkingSet {
 struct WorkingSetState {
    context_server_tools_by_id: HashMap<ToolId, Arc<dyn Tool>>,
    context_server_tools_by_name: HashMap<String, Arc<dyn Tool>>,
+    disabled_tools_by_source: HashMap<ToolSource, HashSet<Arc<str>>>,
    next_tool_id: ToolId,
 }

@@ -45,22 +46,80 @@ impl ToolWorkingSet {
        tools
    }

-    pub fn insert(&self, command: Arc<dyn Tool>) -> ToolId {
+    pub fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
+        let all_tools = self.tools(cx);
+
+        all_tools
+            .into_iter()
+            .filter(|tool| self.is_enabled(&tool.source(), &tool.name().into()))
+            .collect()
+    }
+
+    pub fn tools_by_source(&self, cx: &App) -> IndexMap<ToolSource, Vec<Arc<dyn Tool>>> {
+        let mut tools_by_source = IndexMap::default();
+
+        for tool in self.tools(cx) {
+            tools_by_source
+                .entry(tool.source())
+                .or_insert_with(Vec::new)
+                .push(tool);
+        }
+
+        for tools in tools_by_source.values_mut() {
+            tools.sort_by_key(|tool| tool.name());
+        }
+
+        tools_by_source.sort_unstable_keys();
+
+        tools_by_source
+    }
+
+    pub fn insert(&self, tool: Arc<dyn Tool>) -> ToolId {
        let mut state = self.state.lock();
-        let command_id = state.next_tool_id;
+        let tool_id = state.next_tool_id;
        state.next_tool_id.0 += 1;
        state
            .context_server_tools_by_id
-            .insert(command_id, command.clone());
+            .insert(tool_id, tool.clone());
        state.tools_changed();
-        command_id
+        tool_id
    }

-    pub fn remove(&self, command_ids_to_remove: &[ToolId]) {
+    pub fn is_enabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        !self.is_disabled(source, name)
+    }
+
+    pub fn is_disabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        let state = self.state.lock();
+        state
+            .disabled_tools_by_source
+            .get(source)
+            .map_or(false, |disabled_tools| disabled_tools.contains(name))
+    }
+
+    pub fn enable(&self, source: ToolSource, tools_to_enable: &[Arc<str>]) {
+        let mut state = self.state.lock();
+        state
+            .disabled_tools_by_source
+            .entry(source)
+            .or_default()
+            .retain(|name| !tools_to_enable.contains(name));
+    }
+
+    pub fn disable(&self, source: ToolSource, tools_to_disable: &[Arc<str>]) {
+        let mut state = self.state.lock();
+        state
+            .disabled_tools_by_source
+            .entry(source)
+            .or_default()
+            .extend(tools_to_disable.into_iter().cloned());
+    }
+
+    pub fn remove(&self, tool_ids_to_remove: &[ToolId]) {
        let mut state = self.state.lock();
        state
            .context_server_tools_by_id
-            .retain(|id, _| !command_ids_to_remove.contains(id));
+            .retain(|id, _| !tool_ids_to_remove.contains(id));
        state.tools_changed();
    }
 }
@@ -71,7 +130,7 @@ impl WorkingSetState {
        self.context_server_tools_by_name.extend(
            self.context_server_tools_by_id
                .values()
-                .map(|command| (command.name(), command.clone())),
+                .map(|tool| (tool.name(), tool.clone())),
        );
    }
 }
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -20,4 +20,3 @@ project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-workspace.workspace = true
--- a/crates/assistant_tools/src/list_worktrees_tool.rs
+++ b/crates/assistant_tools/src/list_worktrees_tool.rs
@@ -1,11 +1,11 @@
 use std::sync::Arc;

-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use assistant_tool::Tool;
-use gpui::{App, Task, WeakEntity, Window};
+use gpui::{App, Entity, Task};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use workspace::Workspace;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ListWorktreesToolInput {}
@@ -34,16 +34,9 @@ impl Tool for ListWorktreesTool {
    fn run(
        self: Arc<Self>,
        _input: serde_json::Value,
-        workspace: WeakEntity<Workspace>,
-        _window: &mut Window,
+        project: Entity<Project>,
        cx: &mut App,
    ) -> Task<Result<String>> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace dropped")));
-        };
-
-        let project = workspace.read(cx).project().clone();
-
        cx.spawn(|cx| async move {
            cx.update(|cx| {
                #[derive(Debug, Serialize)]
--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -3,7 +3,8 @@ use std::sync::Arc;
 use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
 use chrono::{Local, Utc};
-use gpui::{App, Task, WeakEntity, Window};
+use gpui::{App, Entity, Task};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

@@ -41,8 +42,7 @@ impl Tool for NowTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _workspace: WeakEntity<workspace::Workspace>,
-        _window: &mut Window,
+        _project: Entity<Project>,
        _cx: &mut App,
    ) -> Task<Result<String>> {
        let input: NowToolInput = match serde_json::from_value(input) {
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -3,11 +3,10 @@ use std::sync::Arc;

 use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
-use gpui::{App, Task, WeakEntity, Window};
-use project::{ProjectPath, WorktreeId};
+use gpui::{App, Entity, Task};
+use project::{Project, ProjectPath, WorktreeId};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use workspace::Workspace;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ReadFileToolInput {
@@ -38,20 +37,14 @@ impl Tool for ReadFileTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        workspace: WeakEntity<Workspace>,
-        _window: &mut Window,
+        project: Entity<Project>,
        cx: &mut App,
    ) -> Task<Result<String>> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace dropped")));
-        };
-
        let input = match serde_json::from_value::<ReadFileToolInput>(input) {
            Ok(input) => input,
            Err(err) => return Task::ready(Err(anyhow!(err))),
        };

-        let project = workspace.read(cx).project().clone();
        let project_path = ProjectPath {
            worktree_id: WorktreeId::from_usize(input.worktree_id),
            path: input.path,
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -828,7 +828,6 @@ impl BufferDiff {
        Some(start..end)
    }

-    #[allow(clippy::too_many_arguments)]
    pub async fn update_diff(
        this: Entity<BufferDiff>,
        buffer: text::BufferSnapshot,
@@ -838,8 +837,8 @@ impl BufferDiff {
        language: Option<Arc<Language>>,
        language_registry: Option<Arc<LanguageRegistry>>,
        cx: &mut AsyncApp,
-    ) -> anyhow::Result<Option<Range<Anchor>>> {
-        let snapshot = if base_text_changed || language_changed {
+    ) -> anyhow::Result<BufferDiffSnapshot> {
+        let inner = if base_text_changed || language_changed {
            cx.update(|cx| {
                Self::build(
                    buffer.clone(),
@@ -861,18 +860,45 @@ impl BufferDiff {
            })?
            .await
        };
-
-        this.update(cx, |this, _| this.set_state(snapshot, &buffer))
+        Ok(BufferDiffSnapshot {
+            inner,
+            secondary_diff: None,
+        })
    }

-    pub fn update_diff_from(
+    pub fn set_snapshot(
        &mut self,
        buffer: &text::BufferSnapshot,
-        other: &Entity<Self>,
+        new_snapshot: BufferDiffSnapshot,
+        language_changed: bool,
+        secondary_changed_range: Option<Range<Anchor>>,
        cx: &mut Context<Self>,
    ) -> Option<Range<Anchor>> {
-        let other = other.read(cx).inner.clone();
-        self.set_state(other, buffer)
+        let changed_range = self.set_state(new_snapshot.inner, buffer);
+        if language_changed {
+            cx.emit(BufferDiffEvent::LanguageChanged);
+        }
+
+        let changed_range = match (secondary_changed_range, changed_range) {
+            (None, None) => None,
+            (Some(unstaged_range), None) => self.range_to_hunk_range(unstaged_range, &buffer, cx),
+            (None, Some(uncommitted_range)) => Some(uncommitted_range),
+            (Some(unstaged_range), Some(uncommitted_range)) => {
+                let mut start = uncommitted_range.start;
+                let mut end = uncommitted_range.end;
+                if let Some(unstaged_range) = self.range_to_hunk_range(unstaged_range, &buffer, cx)
+                {
+                    start = unstaged_range.start.min(&uncommitted_range.start, &buffer);
+                    end = unstaged_range.end.max(&uncommitted_range.end, &buffer);
+                }
+                Some(start..end)
+            }
+        };
+
+        cx.emit(BufferDiffEvent::DiffChanged {
+            changed_range: changed_range.clone(),
+        });
+        changed_range
    }

    fn set_state(
--- a/crates/collab/src/db/queries/messages.rs
+++ b/crates/collab/src/db/queries/messages.rs
@@ -229,7 +229,6 @@ impl Database {
    }

    /// Creates a new channel message.
-    #[allow(clippy::too_many_arguments)]
    pub async fn create_channel_message(
        &self,
        channel_id: ChannelId,
--- a/crates/collab/src/db/queries/users.rs
+++ b/crates/collab/src/db/queries/users.rs
@@ -122,7 +122,6 @@ impl Database {
        .await
    }

-    #[allow(clippy::too_many_arguments)]
    pub async fn get_or_create_user_by_github_account_tx(
        &self,
        github_login: &str,
--- a/crates/collab/src/llm/db/queries/usages.rs
+++ b/crates/collab/src/llm/db/queries/usages.rs
@@ -289,7 +289,6 @@ impl LlmDatabase {
        .await
    }

-    #[allow(clippy::too_many_arguments)]
    pub async fn record_usage(
        &self,
        user_id: UserId,
@@ -554,7 +553,6 @@ impl LlmDatabase {
        .await
    }

-    #[allow(clippy::too_many_arguments)]
    async fn update_usage_for_measure(
        &self,
        user_id: UserId,
--- a/crates/collab/src/llm/token.rs
+++ b/crates/collab/src/llm/token.rs
@@ -33,7 +33,6 @@ pub struct LlmTokenClaims {
 const LLM_TOKEN_LIFETIME: Duration = Duration::from_secs(60 * 60);

 impl LlmTokenClaims {
-    #[allow(clippy::too_many_arguments)]
    pub fn create(
        user: &user::Model,
        is_staff: bool,
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -697,7 +697,6 @@ impl Server {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn handle_connection(
        self: &Arc<Self>,
        connection: Connection,
@@ -1081,7 +1080,6 @@ pub fn routes(server: Arc<Server>) -> Router<(), Body> {
        .layer(Extension(server))
 }

-#[allow(clippy::too_many_arguments)]
 pub async fn handle_websocket_request(
    TypedHeader(ProtocolVersion(protocol_version)): TypedHeader<ProtocolVersion>,
    app_version_header: Option<TypedHeader<AppVersionHeader>>,
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -3,7 +3,6 @@ use crate::{
    tests::{rust_lang, TestServer},
 };
 use call::ActiveCall;
-use collections::HashMap;
 use editor::{
    actions::{
        ConfirmCodeAction, ConfirmCompletion, ConfirmRename, ContextMenuFirst, Redo, Rename,
@@ -1983,7 +1982,6 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
            blame_entry("3a3a3a", 2..3),
            blame_entry("4c4c4c", 3..4),
        ],
-        permalinks: HashMap::default(), // This field is deprecrated
        messages: [
            ("1b1b1b", "message for idx-0"),
            ("0d0d0d", "message for idx-1"),
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -6770,7 +6770,7 @@ async fn test_remote_git_branches(

    assert_eq!(branches_b, branches_set);

-    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch))
        .await
        .unwrap()
        .unwrap();
@@ -6790,23 +6790,15 @@ async fn test_remote_git_branches(
    assert_eq!(host_branch.name, branches[2]);

    // Also try creating a new branch
-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .create_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).create_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();

-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .change_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();

    executor.run_until_parked();

--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ b/crates/collab/src/tests/randomized_test_helpers.rs
@@ -463,7 +463,6 @@ impl<T: RandomizedTest> TestPlan<T> {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    async fn apply_server_operation(
        plan: Arc<Mutex<Self>>,
        deterministic: BackgroundExecutor,
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -294,7 +294,7 @@ async fn test_ssh_collaboration_git_branches(

    assert_eq!(&branches_b, &branches_set);

-    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch))
        .await
        .unwrap()
        .unwrap();
@@ -316,23 +316,15 @@ async fn test_ssh_collaboration_git_branches(
    assert_eq!(server_branch.name, branches[2]);

    // Also try creating a new branch
-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .create_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).create_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();

-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .change_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();

    executor.run_until_parked();

--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -10,9 +10,9 @@ use gpui::{
 };
 use language::{
    language_settings::SoftWrap, Anchor, Buffer, BufferSnapshot, CodeLabel, LanguageRegistry,
-    LanguageServerId, ToOffset,
+    ToOffset,
 };
-use project::{search::SearchQuery, Completion};
+use project::{search::SearchQuery, Completion, CompletionSource};
 use settings::Settings;
 use std::{
    cell::RefCell,
@@ -309,11 +309,9 @@ impl MessageEditor {
                    old_range: range.clone(),
                    new_text,
                    label,
-                    documentation: None,
-                    server_id: LanguageServerId(0), // TODO: Make this optional or something?
-                    lsp_completion: Default::default(), // TODO: Make this optional or something?
                    confirm: None,
-                    resolved: true,
+                    documentation: None,
+                    source: CompletionSource::Custom,
                }
            })
            .collect()
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -869,7 +869,6 @@ impl CollabPanel {
            })
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_participant_project(
        &self,
        project_id: u64,
--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -78,6 +78,7 @@ pub struct ComponentId(pub &'static str);

 #[derive(Clone)]
 pub struct ComponentMetadata {
+    id: ComponentId,
    name: SharedString,
    scope: Option<ComponentScope>,
    description: Option<SharedString>,
@@ -85,6 +86,10 @@ pub struct ComponentMetadata {
 }

 impl ComponentMetadata {
+    pub fn id(&self) -> ComponentId {
+        self.id.clone()
+    }
+
    pub fn name(&self) -> SharedString {
        self.name.clone()
    }
@@ -156,9 +161,11 @@ pub fn components() -> AllComponents {
    for (ref scope, name, description) in &data.components {
        let preview = data.previews.get(name).cloned();
        let component_name = SharedString::new_static(name);
+        let id = ComponentId(name);
        all_components.insert(
-            ComponentId(name),
+            id.clone(),
            ComponentMetadata {
+                id,
                name: component_name,
                scope: scope.clone(),
                description: description.map(Into::into),
--- a/crates/component_preview/Cargo.toml
+++ b/crates/component_preview/Cargo.toml
@@ -23,3 +23,4 @@ project.workspace = true
 ui.workspace = true
 workspace.workspace = true
 notifications.workspace = true
+collections.workspace = true
--- a/crates/component_preview/src/component_preview.rs
+++ b/crates/component_preview/src/component_preview.rs
@@ -6,12 +6,14 @@ use std::iter::Iterator;
 use std::sync::Arc;

 use client::UserStore;
-use component::{components, ComponentMetadata};
+use component::{components, ComponentId, ComponentMetadata};
 use gpui::{
    list, prelude::*, uniform_list, App, Entity, EventEmitter, FocusHandle, Focusable, Task,
    WeakEntity, Window,
 };

+use collections::HashMap;
+
 use gpui::{ListState, ScrollHandle, UniformListScrollHandle};
 use languages::LanguageRegistry;
 use notifications::status_toast::{StatusToast, ToastIcon};
@@ -59,6 +61,8 @@ pub fn init(app_state: Arc<AppState>, cx: &mut App) {
 }

 enum PreviewEntry {
+    AllComponents,
+    Separator,
    Component(ComponentMetadata),
    SectionHeader(SharedString),
 }
@@ -75,13 +79,22 @@ impl From<SharedString> for PreviewEntry {
    }
 }

+#[derive(Default, Debug, Clone, PartialEq, Eq)]
+enum PreviewPage {
+    #[default]
+    AllComponents,
+    Component(ComponentId),
+}
+
 struct ComponentPreview {
    focus_handle: FocusHandle,
    _view_scroll_handle: ScrollHandle,
    nav_scroll_handle: UniformListScrollHandle,
+    component_map: HashMap<ComponentId, ComponentMetadata>,
+    active_page: PreviewPage,
    components: Vec<ComponentMetadata>,
    component_list: ListState,
-    selected_index: usize,
+    cursor_index: usize,
    language_registry: Arc<LanguageRegistry>,
    workspace: WeakEntity<Workspace>,
    user_store: Entity<UserStore>,
@@ -95,22 +108,25 @@ impl ComponentPreview {
        selected_index: impl Into<Option<usize>>,
        cx: &mut Context<Self>,
    ) -> Self {
-        let components = components().all_sorted();
-        let initial_length = components.len();
+        let sorted_components = components().all_sorted();
        let selected_index = selected_index.into().unwrap_or(0);

-        let component_list =
-            ListState::new(initial_length, gpui::ListAlignment::Top, px(1500.0), {
+        let component_list = ListState::new(
+            sorted_components.len(),
+            gpui::ListAlignment::Top,
+            px(1500.0),
+            {
                let this = cx.entity().downgrade();
                move |ix, window: &mut Window, cx: &mut App| {
                    this.update(cx, |this, cx| {
                        let component = this.get_component(ix);
-                        this.render_preview(ix, &component, window, cx)
+                        this.render_preview(&component, window, cx)
                            .into_any_element()
                    })
                    .unwrap()
                }
-            });
+            },
+        );

        let mut component_preview = Self {
            focus_handle: cx.focus_handle(),
@@ -119,13 +135,15 @@ impl ComponentPreview {
            language_registry,
            user_store,
            workspace,
-            components,
+            active_page: PreviewPage::AllComponents,
+            component_map: components().0,
+            components: sorted_components,
            component_list,
-            selected_index,
+            cursor_index: selected_index,
        };

-        if component_preview.selected_index > 0 {
-            component_preview.scroll_to_preview(component_preview.selected_index, cx);
+        if component_preview.cursor_index > 0 {
+            component_preview.scroll_to_preview(component_preview.cursor_index, cx);
        }

        component_preview.update_component_list(cx);
@@ -135,7 +153,12 @@ impl ComponentPreview {

    fn scroll_to_preview(&mut self, ix: usize, cx: &mut Context<Self>) {
        self.component_list.scroll_to_reveal_item(ix);
-        self.selected_index = ix;
+        self.cursor_index = ix;
+        cx.notify();
+    }
+
+    fn set_active_page(&mut self, page: PreviewPage, cx: &mut Context<Self>) {
+        self.active_page = page;
        cx.notify();
    }

@@ -146,7 +169,6 @@ impl ComponentPreview {
    fn scope_ordered_entries(&self) -> Vec<PreviewEntry> {
        use std::collections::HashMap;

-        // Group components by scope
        let mut scope_groups: HashMap<Option<ComponentScope>, Vec<ComponentMetadata>> =
            HashMap::default();

@@ -157,15 +179,12 @@ impl ComponentPreview {
                .push(component.clone());
        }

-        // Sort components within each scope by name
        for components in scope_groups.values_mut() {
            components.sort_by_key(|c| c.name().to_lowercase());
        }

-        // Build entries with scopes in a defined order
        let mut entries = Vec::new();

-        // Define scope order (we want Unknown at the end)
        let known_scopes = [
            ComponentScope::Layout,
            ComponentScope::Input,
@@ -175,15 +194,16 @@ impl ComponentPreview {
            ComponentScope::VersionControl,
        ];

-        // First add components with known scopes
+        // Always show all components first
+        entries.push(PreviewEntry::AllComponents);
+        entries.push(PreviewEntry::Separator);
+
        for scope in known_scopes.iter() {
            let scope_key = Some(scope.clone());
            if let Some(components) = scope_groups.remove(&scope_key) {
                if !components.is_empty() {
-                    // Add section header
                    entries.push(PreviewEntry::SectionHeader(scope.to_string().into()));

-                    // Add all components under this scope
                    for component in components {
                        entries.push(PreviewEntry::Component(component));
                    }
@@ -191,16 +211,13 @@ impl ComponentPreview {
            }
        }

-        // Handle components with Unknown scope
        for (scope, components) in &scope_groups {
            if let Some(ComponentScope::Unknown(_)) = scope {
                if !components.is_empty() {
-                    // Add the unknown scope header
                    if let Some(scope_value) = scope {
                        entries.push(PreviewEntry::SectionHeader(scope_value.to_string().into()));
                    }

-                    // Add all components under this unknown scope
                    for component in components {
                        entries.push(PreviewEntry::Component(component.clone()));
                    }
@@ -208,9 +225,9 @@ impl ComponentPreview {
            }
        }

-        // Handle components with no scope
        if let Some(components) = scope_groups.get(&None) {
            if !components.is_empty() {
+                entries.push(PreviewEntry::Separator);
                entries.push(PreviewEntry::SectionHeader("Uncategorized".into()));

                for component in components {
@@ -226,22 +243,42 @@ impl ComponentPreview {
        &self,
        ix: usize,
        entry: &PreviewEntry,
-        selected: bool,
        cx: &Context<Self>,
    ) -> impl IntoElement {
        match entry {
-            PreviewEntry::Component(component_metadata) => ListItem::new(ix)
-                .child(Label::new(component_metadata.name().clone()).color(Color::Default))
-                .selectable(true)
-                .toggle_state(selected)
-                .inset(true)
-                .on_click(cx.listener(move |this, _, _, cx| {
-                    this.scroll_to_preview(ix, cx);
-                }))
-                .into_any_element(),
+            PreviewEntry::Component(component_metadata) => {
+                let id = component_metadata.id();
+                let selected = self.active_page == PreviewPage::Component(id.clone());
+                ListItem::new(ix)
+                    .child(Label::new(component_metadata.name().clone()).color(Color::Default))
+                    .selectable(true)
+                    .toggle_state(selected)
+                    .inset(true)
+                    .on_click(cx.listener(move |this, _, _, cx| {
+                        let id = id.clone();
+                        this.set_active_page(PreviewPage::Component(id), cx);
+                    }))
+                    .into_any_element()
+            }
            PreviewEntry::SectionHeader(shared_string) => ListSubHeader::new(shared_string)
                .inset(true)
                .into_any_element(),
+            PreviewEntry::AllComponents => {
+                let selected = self.active_page == PreviewPage::AllComponents;
+
+                ListItem::new(ix)
+                    .child(Label::new("All Components").color(Color::Default))
+                    .selectable(true)
+                    .toggle_state(selected)
+                    .inset(true)
+                    .on_click(cx.listener(move |this, _, _, cx| {
+                        this.set_active_page(PreviewPage::AllComponents, cx);
+                    }))
+                    .into_any_element()
+            }
+            PreviewEntry::Separator => ListItem::new(ix)
+                .child(h_flex().pt_3().child(Divider::horizontal_dashed()))
+                .into_any_element(),
        }
    }

@@ -260,11 +297,13 @@ impl ComponentPreview {
                weak_entity
                    .update(cx, |this, cx| match entry {
                        PreviewEntry::Component(component) => this
-                            .render_preview(ix, component, window, cx)
+                            .render_preview(component, window, cx)
                            .into_any_element(),
                        PreviewEntry::SectionHeader(shared_string) => this
                            .render_scope_header(ix, shared_string.clone(), window, cx)
                            .into_any_element(),
+                        PreviewEntry::AllComponents => div().w_full().h_0().into_any_element(),
+                        PreviewEntry::Separator => div().w_full().h_0().into_any_element(),
                    })
                    .unwrap()
            },
@@ -290,7 +329,6 @@ impl ComponentPreview {

    fn render_preview(
        &self,
-        _ix: usize,
        component: &ComponentMetadata,
        window: &mut Window,
        cx: &mut App,
@@ -341,6 +379,44 @@ impl ComponentPreview {
            .into_any_element()
    }

+    fn render_all_components(&self) -> impl IntoElement {
+        v_flex()
+            .id("component-list")
+            .px_8()
+            .pt_4()
+            .size_full()
+            .child(
+                list(self.component_list.clone())
+                    .flex_grow()
+                    .with_sizing_behavior(gpui::ListSizingBehavior::Auto),
+            )
+    }
+
+    fn render_component_page(
+        &mut self,
+        component_id: &ComponentId,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let component = self.component_map.get(&component_id);
+
+        if let Some(component) = component {
+            v_flex()
+                .w_full()
+                .flex_initial()
+                .min_h_full()
+                .child(self.render_preview(component, window, cx))
+                .into_any_element()
+        } else {
+            v_flex()
+                .size_full()
+                .items_center()
+                .justify_center()
+                .child("Component not found")
+                .into_any_element()
+        }
+    }
+
    fn test_status_toast(&self, window: &mut Window, cx: &mut Context<Self>) {
        if let Some(workspace) = self.workspace.upgrade() {
            workspace.update(cx, |workspace, cx| {
@@ -363,8 +439,9 @@ impl ComponentPreview {
 }

 impl Render for ComponentPreview {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<'_, Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let sidebar_entries = self.scope_ordered_entries();
+        let active_page = self.active_page.clone();

        h_flex()
            .id("component-preview")
@@ -386,12 +463,7 @@ impl Render for ComponentPreview {
                            move |this, range, _window, cx| {
                                range
                                    .map(|ix| {
-                                        this.render_sidebar_entry(
-                                            ix,
-                                            &sidebar_entries[ix],
-                                            ix == this.selected_index,
-                                            cx,
-                                        )
+                                        this.render_sidebar_entry(ix, &sidebar_entries[ix], cx)
                                    })
                                    .collect()
                            },
@@ -415,18 +487,12 @@ impl Render for ComponentPreview {
                        ),
                    ),
            )
-            .child(
-                v_flex()
-                    .id("component-list")
-                    .px_8()
-                    .pt_4()
-                    .size_full()
-                    .child(
-                        list(self.component_list.clone())
-                            .flex_grow()
-                            .with_sizing_behavior(gpui::ListSizingBehavior::Auto),
-                    ),
-            )
+            .child(match active_page {
+                PreviewPage::AllComponents => self.render_all_components().into_any_element(),
+                PreviewPage::Component(id) => self
+                    .render_component_page(&id, window, cx)
+                    .into_any_element(),
+            })
    }
 }

@@ -465,7 +531,7 @@ impl Item for ComponentPreview {
        let language_registry = self.language_registry.clone();
        let user_store = self.user_store.clone();
        let weak_workspace = self.workspace.clone();
-        let selected_index = self.selected_index;
+        let selected_index = self.cursor_index;

        Some(cx.new(|cx| {
            Self::new(
--- a/crates/context_server/Cargo.toml
+++ b/crates/context_server/Cargo.toml
@@ -31,4 +31,3 @@ settings.workspace = true
 smol.workspace = true
 url = { workspace = true, features = ["serde"] }
 util.workspace = true
-workspace.workspace = true
--- a/crates/context_server/src/context_server_tool.rs
+++ b/crates/context_server/src/context_server_tool.rs
@@ -1,8 +1,9 @@
 use std::sync::Arc;

-use anyhow::{anyhow, bail};
-use assistant_tool::Tool;
-use gpui::{App, Entity, Task, Window};
+use anyhow::{anyhow, bail, Result};
+use assistant_tool::{Tool, ToolSource};
+use gpui::{App, Entity, Task};
+use project::Project;

 use crate::manager::ContextServerManager;
 use crate::types;
@@ -36,6 +37,12 @@ impl Tool for ContextServerTool {
        self.tool.description.clone().unwrap_or_default()
    }

+    fn source(&self) -> ToolSource {
+        ToolSource::ContextServer {
+            id: self.server_id.clone().into(),
+        }
+    }
+
    fn input_schema(&self) -> serde_json::Value {
        match &self.tool.input_schema {
            serde_json::Value::Null => {
@@ -49,12 +56,11 @@ impl Tool for ContextServerTool {
    }

    fn run(
-        self: std::sync::Arc<Self>,
+        self: Arc<Self>,
        input: serde_json::Value,
-        _workspace: gpui::WeakEntity<workspace::Workspace>,
-        _: &mut Window,
+        _project: Entity<Project>,
        cx: &mut App,
-    ) -> gpui::Task<gpui::Result<String>> {
+    ) -> Task<Result<String>> {
        if let Some(server) = self.server_manager.read(cx).get_server(&self.server_id) {
            cx.foreground_executor().spawn({
                let tool_name = self.tool.name.clone();
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -623,16 +623,21 @@ impl Copilot {

    pub fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        self.update_sign_in_status(request::SignInStatus::NotSignedIn, cx);
-        if let CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) = &self.server {
-            let server = server.clone();
-            cx.background_spawn(async move {
-                server
-                    .request::<request::SignOut>(request::SignOutParams {})
-                    .await?;
+        match &self.server {
+            CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) => {
+                let server = server.clone();
+                cx.background_spawn(async move {
+                    server
+                        .request::<request::SignOut>(request::SignOutParams {})
+                        .await?;
+                    anyhow::Ok(())
+                })
+            }
+            CopilotServer::Disabled => cx.background_spawn(async move {
+                clear_copilot_config_dir().await;
                anyhow::Ok(())
-            })
-        } else {
-            Task::ready(Err(anyhow!("copilot hasn't started yet")))
+            }),
+            _ => Task::ready(Err(anyhow!("copilot hasn't started yet"))),
        }
    }

@@ -1016,6 +1021,10 @@ async fn clear_copilot_dir() {
    remove_matching(paths::copilot_dir(), |_| true).await
 }

+async fn clear_copilot_config_dir() {
+    remove_matching(copilot_chat::copilot_chat_config_dir(), |_| true).await
+}
+
 async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
    const SERVER_PATH: &str = "dist/language-server.js";

--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -4,13 +4,14 @@ use std::sync::OnceLock;

 use anyhow::{anyhow, Result};
 use chrono::DateTime;
+use collections::HashSet;
 use fs::Fs;
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, StreamExt};
 use gpui::{prelude::*, App, AsyncApp, Global};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use paths::home_dir;
 use serde::{Deserialize, Serialize};
-use settings::watch_config_file;
+use settings::watch_config_dir;
 use strum::EnumIter;

 pub const COPILOT_CHAT_COMPLETION_URL: &str = "https://api.githubcopilot.com/chat/completions";
@@ -212,7 +213,7 @@ pub fn init(fs: Arc<dyn Fs>, client: Arc<dyn HttpClient>, cx: &mut App) {
    cx.set_global(GlobalCopilotChat(copilot_chat));
 }

-fn copilot_chat_config_dir() -> &'static PathBuf {
+pub fn copilot_chat_config_dir() -> &'static PathBuf {
    static COPILOT_CHAT_CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();

    COPILOT_CHAT_CONFIG_DIR.get_or_init(|| {
@@ -237,27 +238,18 @@ impl CopilotChat {
    }

    pub fn new(fs: Arc<dyn Fs>, client: Arc<dyn HttpClient>, cx: &App) -> Self {
-        let config_paths = copilot_chat_config_paths();
-
-        let resolve_config_path = {
-            let fs = fs.clone();
-            async move {
-                for config_path in config_paths.iter() {
-                    if fs.metadata(config_path).await.is_ok_and(|v| v.is_some()) {
-                        return config_path.clone();
-                    }
-                }
-                config_paths[0].clone()
-            }
-        };
+        let config_paths: HashSet<PathBuf> = copilot_chat_config_paths().into_iter().collect();
+        let dir_path = copilot_chat_config_dir();

        cx.spawn(|cx| async move {
-            let config_file = resolve_config_path.await;
-            let mut config_file_rx = watch_config_file(cx.background_executor(), fs, config_file);
-
-            while let Some(contents) = config_file_rx.next().await {
+            let mut parent_watch_rx = watch_config_dir(
+                cx.background_executor(),
+                fs.clone(),
+                dir_path.clone(),
+                config_paths,
+            );
+            while let Some(contents) = parent_watch_rx.next().await {
                let oauth_token = extract_oauth_token(contents);
-
                cx.update(|cx| {
                    if let Some(this) = Self::global(cx).as_ref() {
                        this.update(cx, |this, cx| {
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -311,7 +311,10 @@ impl ProjectDiagnosticsEditor {
        cx: &mut Context<Workspace>,
    ) {
        if let Some(existing) = workspace.item_of_type::<ProjectDiagnosticsEditor>(cx) {
-            workspace.activate_item(&existing, true, true, window, cx);
+            let is_active = workspace
+                .active_item(cx)
+                .is_some_and(|item| item.item_id() == existing.item_id());
+            workspace.activate_item(&existing, true, !is_active, window, cx);
        } else {
            let workspace_handle = cx.entity().downgrade();

--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -340,7 +340,9 @@ gpui::actions!(
        MoveToPreviousWordStart,
        MoveToStartOfParagraph,
        MoveToStartOfExcerpt,
+        MoveToStartOfNextExcerpt,
        MoveToEndOfExcerpt,
+        MoveToEndOfPreviousExcerpt,
        MoveUp,
        Newline,
        NewlineAbove,
@@ -378,7 +380,9 @@ gpui::actions!(
        SelectAll,
        SelectAllMatches,
        SelectToStartOfExcerpt,
+        SelectToStartOfNextExcerpt,
        SelectToEndOfExcerpt,
+        SelectToEndOfPreviousExcerpt,
        SelectDown,
        SelectEnclosingSymbol,
        SelectLargerSyntaxNode,
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -6,11 +6,11 @@ use gpui::{
 };
 use language::Buffer;
 use language::CodeLabel;
-use lsp::LanguageServerId;
 use markdown::Markdown;
 use multi_buffer::{Anchor, ExcerptId};
 use ordered_float::OrderedFloat;
 use project::lsp_store::CompletionDocumentation;
+use project::CompletionSource;
 use project::{CodeAction, Completion, TaskSourceKind};

 use std::{
@@ -233,11 +233,9 @@ impl CompletionsMenu {
                    runs: Default::default(),
                    filter_range: Default::default(),
                },
-                server_id: LanguageServerId(usize::MAX),
                documentation: None,
-                lsp_completion: Default::default(),
                confirm: None,
-                resolved: true,
+                source: CompletionSource::Custom,
            })
            .collect();

@@ -500,7 +498,12 @@ impl CompletionsMenu {
                                    // Ignore font weight for syntax highlighting, as we'll use it
                                    // for fuzzy matches.
                                    highlight.font_weight = None;
-                                    if completion.lsp_completion.deprecated.unwrap_or(false) {
+                                    if completion
+                                        .source
+                                        .lsp_completion(false)
+                                        .and_then(|lsp_completion| lsp_completion.deprecated)
+                                        .unwrap_or(false)
+                                    {
                                        highlight.strikethrough = Some(StrikethroughStyle {
                                            thickness: 1.0.into(),
                                            ..Default::default()
@@ -708,7 +711,12 @@ impl CompletionsMenu {

                let completion = &completions[mat.candidate_id];
                let sort_key = completion.sort_key();
-                let sort_text = completion.lsp_completion.sort_text.as_deref();
+                let sort_text =
+                    if let CompletionSource::Lsp { lsp_completion, .. } = &completion.source {
+                        lsp_completion.sort_text.as_deref()
+                    } else {
+                        None
+                    };
                let score = Reverse(OrderedFloat(mat.score));

                if mat.score >= 0.2 {
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -113,7 +113,6 @@ pub struct DisplayMap {
 }

 impl DisplayMap {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        buffer: Entity<MultiBuffer>,
        font: Font,
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -726,7 +726,6 @@ impl BlockMap {
        self.show_excerpt_controls
    }

-    #[allow(clippy::too_many_arguments)]
    fn header_and_footer_blocks<'a, R, T>(
        show_excerpt_controls: bool,
        excerpt_footer_height: u32,
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -138,8 +138,9 @@ use multi_buffer::{
 use project::{
    lsp_store::{CompletionDocumentation, FormatTrigger, LspFormatTarget, OpenLspBufferHandle},
    project_settings::{GitGutterSetting, ProjectSettings},
-    CodeAction, Completion, CompletionIntent, DocumentHighlight, InlayHint, Location, LocationLink,
-    PrepareRenameResponse, Project, ProjectItem, ProjectTransaction, TaskSourceKind,
+    CodeAction, Completion, CompletionIntent, CompletionSource, DocumentHighlight, InlayHint,
+    Location, LocationLink, PrepareRenameResponse, Project, ProjectItem, ProjectTransaction,
+    TaskSourceKind,
 };
 use rand::prelude::*;
 use rpc::{proto::*, ErrorExt};
@@ -1250,11 +1251,6 @@ impl Editor {
        let mut project_subscriptions = Vec::new();
        if mode == EditorMode::Full {
            if let Some(project) = project.as_ref() {
-                if buffer.read(cx).is_singleton() {
-                    project_subscriptions.push(cx.observe_in(project, window, |_, _, _, cx| {
-                        cx.emit(EditorEvent::TitleChanged);
-                    }));
-                }
                project_subscriptions.push(cx.subscribe_in(
                    project,
                    window,
@@ -1577,13 +1573,16 @@ impl Editor {
            }
        }

-        if let Some(extension) = self
-            .buffer
-            .read(cx)
-            .as_singleton()
-            .and_then(|buffer| buffer.read(cx).file()?.path().extension()?.to_str())
-        {
-            key_context.set("extension", extension.to_string());
+        if let Some(singleton_buffer) = self.buffer.read(cx).as_singleton() {
+            if let Some(extension) = singleton_buffer
+                .read(cx)
+                .file()
+                .and_then(|file| file.path().extension()?.to_str())
+            {
+                key_context.set("extension", extension.to_string());
+            }
+        } else {
+            key_context.add("multibuffer");
        }

        if has_active_edit_prediction {
@@ -5932,7 +5931,6 @@ impl Editor {
    const EDIT_PREDICTION_POPOVER_PADDING_X: Pixels = Pixels(24.);
    const EDIT_PREDICTION_POPOVER_PADDING_Y: Pixels = Pixels(2.);

-    #[allow(clippy::too_many_arguments)]
    fn render_edit_prediction_popover(
        &mut self,
        text_bounds: &Bounds<Pixels>,
@@ -6044,7 +6042,6 @@ impl Editor {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_edit_prediction_modifier_jump_popover(
        &mut self,
        text_bounds: &Bounds<Pixels>,
@@ -6140,7 +6137,6 @@ impl Editor {
        Some((element, origin))
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_edit_prediction_scroll_popover(
        &mut self,
        to_y: impl Fn(Size<Pixels>) -> Pixels,
@@ -6171,7 +6167,6 @@ impl Editor {
        Some((element, origin))
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_edit_prediction_eager_jump_popover(
        &mut self,
        text_bounds: &Bounds<Pixels>,
@@ -6241,7 +6236,6 @@ impl Editor {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_edit_prediction_end_of_line_popover(
        self: &mut Editor,
        label: &'static str,
@@ -6300,7 +6294,6 @@ impl Editor {
        Some((element, origin))
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_edit_prediction_diff_popover(
        self: &Editor,
        text_bounds: &Bounds<Pixels>,
@@ -6608,7 +6601,6 @@ impl Editor {
        editor_bg_color.blend(accent_color.opacity(0.6))
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_edit_prediction_cursor_popover(
        &self,
        min_width: Pixels,
@@ -9849,6 +9841,31 @@ impl Editor {
        })
    }

+    pub fn move_to_start_of_next_excerpt(
+        &mut self,
+        _: &MoveToStartOfNextExcerpt,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+            cx.propagate();
+            return;
+        }
+
+        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
+            s.move_with(|map, selection| {
+                selection.collapse_to(
+                    movement::start_of_excerpt(
+                        map,
+                        selection.head(),
+                        workspace::searchable::Direction::Next,
+                    ),
+                    SelectionGoal::None,
+                )
+            });
+        })
+    }
+
    pub fn move_to_end_of_excerpt(
        &mut self,
        _: &MoveToEndOfExcerpt,
@@ -9874,6 +9891,31 @@ impl Editor {
        })
    }

+    pub fn move_to_end_of_previous_excerpt(
+        &mut self,
+        _: &MoveToEndOfPreviousExcerpt,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+            cx.propagate();
+            return;
+        }
+
+        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
+            s.move_with(|map, selection| {
+                selection.collapse_to(
+                    movement::end_of_excerpt(
+                        map,
+                        selection.head(),
+                        workspace::searchable::Direction::Prev,
+                    ),
+                    SelectionGoal::None,
+                )
+            });
+        })
+    }
+
    pub fn select_to_start_of_excerpt(
        &mut self,
        _: &SelectToStartOfExcerpt,
@@ -9895,6 +9937,27 @@ impl Editor {
        })
    }

+    pub fn select_to_start_of_next_excerpt(
+        &mut self,
+        _: &SelectToStartOfNextExcerpt,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+            cx.propagate();
+            return;
+        }
+
+        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
+            s.move_heads_with(|map, head, _| {
+                (
+                    movement::start_of_excerpt(map, head, workspace::searchable::Direction::Next),
+                    SelectionGoal::None,
+                )
+            });
+        })
+    }
+
    pub fn select_to_end_of_excerpt(
        &mut self,
        _: &SelectToEndOfExcerpt,
@@ -9916,6 +9979,27 @@ impl Editor {
        })
    }

+    pub fn select_to_end_of_previous_excerpt(
+        &mut self,
+        _: &SelectToEndOfPreviousExcerpt,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+            cx.propagate();
+            return;
+        }
+
+        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
+            s.move_heads_with(|map, head, _| {
+                (
+                    movement::end_of_excerpt(map, head, workspace::searchable::Direction::Prev),
+                    SelectionGoal::None,
+                )
+            });
+        })
+    }
+
    pub fn move_to_beginning(
        &mut self,
        _: &MoveToBeginning,
@@ -11548,7 +11632,7 @@ impl Editor {
    fn go_to_next_hunk(&mut self, _: &GoToHunk, window: &mut Window, cx: &mut Context<Self>) {
        let snapshot = self.snapshot(window, cx);
        let selection = self.selections.newest::<Point>(cx);
-        self.go_to_hunk_after_or_before_position(
+        self.go_to_hunk_before_or_after_position(
            &snapshot,
            selection.head(),
            Direction::Next,
@@ -11557,7 +11641,7 @@ impl Editor {
        );
    }

-    fn go_to_hunk_after_or_before_position(
+    fn go_to_hunk_before_or_after_position(
        &mut self,
        snapshot: &EditorSnapshot,
        position: Point,
@@ -11608,7 +11692,7 @@ impl Editor {
    ) {
        let snapshot = self.snapshot(window, cx);
        let selection = self.selections.newest::<Point>(cx);
-        self.go_to_hunk_after_or_before_position(
+        self.go_to_hunk_before_or_after_position(
            &snapshot,
            selection.head(),
            Direction::Prev,
@@ -13770,21 +13854,6 @@ impl Editor {
            return;
        }

-        let snapshot = self.snapshot(window, cx);
-        let newest_range = self.selections.newest::<Point>(cx).range();
-
-        let run_twice = snapshot
-            .hunks_for_ranges([newest_range])
-            .first()
-            .is_some_and(|hunk| {
-                let next_line = Point::new(hunk.row_range.end.0 + 1, 0);
-                self.hunk_after_position(&snapshot, next_line)
-                    .is_some_and(|other| other.row_range == hunk.row_range)
-            });
-
-        if run_twice {
-            self.go_to_next_hunk(&GoToHunk, window, cx);
-        }
        self.stage_or_unstage_diff_hunks(stage, ranges, cx);
        self.go_to_next_hunk(&GoToHunk, window, cx);
    }
@@ -14212,6 +14281,13 @@ impl Editor {
        EditorSettings::override_global(editor_settings, cx);
    }

+    pub fn line_numbers_enabled(&self, cx: &App) -> bool {
+        if let Some(show_line_numbers) = self.show_line_numbers {
+            return show_line_numbers;
+        }
+        EditorSettings::get_global(cx).gutter.line_numbers
+    }
+
    pub fn should_use_relative_line_numbers(&self, cx: &mut App) -> bool {
        self.use_relative_line_numbers
            .unwrap_or(EditorSettings::get_global(cx).relative_line_numbers)
@@ -14887,14 +14963,14 @@ impl Editor {
        &self,
        window: &mut Window,
        cx: &mut App,
-    ) -> BTreeMap<DisplayRow, Background> {
+    ) -> BTreeMap<DisplayRow, LineHighlight> {
        let snapshot = self.snapshot(window, cx);
        let mut used_highlight_orders = HashMap::default();
        self.highlighted_rows
            .iter()
            .flat_map(|(_, highlighted_rows)| highlighted_rows.iter())
            .fold(
-                BTreeMap::<DisplayRow, Background>::new(),
+                BTreeMap::<DisplayRow, LineHighlight>::new(),
                |mut unique_rows, highlight| {
                    let start = highlight.range.start.to_display_point(&snapshot);
                    let end = highlight.range.end.to_display_point(&snapshot);
@@ -15442,14 +15518,9 @@ impl Editor {
            }
            multi_buffer::Event::DirtyChanged => cx.emit(EditorEvent::DirtyChanged),
            multi_buffer::Event::Saved => cx.emit(EditorEvent::Saved),
-            multi_buffer::Event::FileHandleChanged | multi_buffer::Event::Reloaded => {
-                cx.emit(EditorEvent::TitleChanged)
-            }
-            // multi_buffer::Event::DiffBaseChanged => {
-            //     self.scrollbar_marker_state.dirty = true;
-            //     cx.emit(EditorEvent::DiffBaseChanged);
-            //     cx.notify();
-            // }
+            multi_buffer::Event::FileHandleChanged
+            | multi_buffer::Event::Reloaded
+            | multi_buffer::Event::BufferDiffChanged => cx.emit(EditorEvent::TitleChanged),
            multi_buffer::Event::Closed => cx.emit(EditorEvent::Closed),
            multi_buffer::Event::DiagnosticsUpdated => {
                self.refresh_active_diagnostics(cx);
@@ -16907,38 +16978,41 @@ fn snippet_completions(
                Some(Completion {
                    old_range: range,
                    new_text: snippet.body.clone(),
-                    resolved: false,
+                    source: CompletionSource::Lsp {
+                        server_id: LanguageServerId(usize::MAX),
+                        resolved: true,
+                        lsp_completion: Box::new(lsp::CompletionItem {
+                            label: snippet.prefix.first().unwrap().clone(),
+                            kind: Some(CompletionItemKind::SNIPPET),
+                            label_details: snippet.description.as_ref().map(|description| {
+                                lsp::CompletionItemLabelDetails {
+                                    detail: Some(description.clone()),
+                                    description: None,
+                                }
+                            }),
+                            insert_text_format: Some(InsertTextFormat::SNIPPET),
+                            text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
+                                lsp::InsertReplaceEdit {
+                                    new_text: snippet.body.clone(),
+                                    insert: lsp_range,
+                                    replace: lsp_range,
+                                },
+                            )),
+                            filter_text: Some(snippet.body.clone()),
+                            sort_text: Some(char::MAX.to_string()),
+                            ..lsp::CompletionItem::default()
+                        }),
+                        lsp_defaults: None,
+                    },
                    label: CodeLabel {
                        text: matching_prefix.clone(),
-                        runs: vec![],
+                        runs: Vec::new(),
                        filter_range: 0..matching_prefix.len(),
                    },
-                    server_id: LanguageServerId(usize::MAX),
                    documentation: snippet
                        .description
                        .clone()
                        .map(|description| CompletionDocumentation::SingleLine(description.into())),
-                    lsp_completion: lsp::CompletionItem {
-                        label: snippet.prefix.first().unwrap().clone(),
-                        kind: Some(CompletionItemKind::SNIPPET),
-                        label_details: snippet.description.as_ref().map(|description| {
-                            lsp::CompletionItemLabelDetails {
-                                detail: Some(description.clone()),
-                                description: None,
-                            }
-                        }),
-                        insert_text_format: Some(InsertTextFormat::SNIPPET),
-                        text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                            lsp::InsertReplaceEdit {
-                                new_text: snippet.body.clone(),
-                                insert: lsp_range,
-                                replace: lsp_range,
-                            },
-                        )),
-                        filter_text: Some(snippet.body.clone()),
-                        sort_text: Some(char::MAX.to_string()),
-                        ..Default::default()
-                    },
                    confirm: None,
                })
            })
@@ -18436,3 +18510,27 @@ impl Render for MissingEditPredictionKeybindingTooltip {
        })
    }
 }
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct LineHighlight {
+    pub background: Background,
+    pub border: Option<gpui::Hsla>,
+}
+
+impl From<Hsla> for LineHighlight {
+    fn from(hsla: Hsla) -> Self {
+        Self {
+            background: hsla.into(),
+            border: None,
+        }
+    }
+}
+
+impl From<Background> for LineHighlight {
+    fn from(background: Background) -> Self {
+        Self {
+            background,
+            border: None,
+        }
+    }
+}
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -12334,24 +12334,6 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
        },
    };

-    let item_0_out = lsp::CompletionItem {
-        commit_characters: Some(default_commit_characters.clone()),
-        insert_text_format: Some(default_insert_text_format),
-        ..item_0
-    };
-    let items_out = iter::once(item_0_out)
-        .chain(items[1..].iter().map(|item| lsp::CompletionItem {
-            commit_characters: Some(default_commit_characters.clone()),
-            data: Some(default_data.clone()),
-            insert_text_mode: Some(default_insert_text_mode),
-            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                range: default_edit_range,
-                new_text: item.label.clone(),
-            })),
-            ..item.clone()
-        }))
-        .collect::<Vec<lsp::CompletionItem>>();
-
    let mut cx = EditorLspTestContext::new_rust(
        lsp::ServerCapabilities {
            completion_provider: Some(lsp::CompletionOptions {
@@ -12370,10 +12352,11 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)

    let completion_data = default_data.clone();
    let completion_characters = default_commit_characters.clone();
+    let completion_items = items.clone();
    cx.handle_request::<lsp::request::Completion, _, _>(move |_, _, _| {
        let default_data = completion_data.clone();
        let default_commit_characters = completion_characters.clone();
-        let items = items.clone();
+        let items = completion_items.clone();
        async move {
            Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
                items,
@@ -12422,7 +12405,7 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
                        .iter()
                        .map(|mat| mat.string.clone())
                        .collect::<Vec<String>>(),
-                    items_out
+                    items
                        .iter()
                        .map(|completion| completion.label.clone())
                        .collect::<Vec<String>>()
@@ -12435,14 +12418,18 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
    // with 4 from the end.
    assert_eq!(
        *resolved_items.lock(),
-        [
-            &items_out[0..16],
-            &items_out[items_out.len() - 4..items_out.len()]
-        ]
-        .concat()
-        .iter()
-        .cloned()
-        .collect::<Vec<lsp::CompletionItem>>()
+        [&items[0..16], &items[items.len() - 4..items.len()]]
+            .concat()
+            .iter()
+            .cloned()
+            .map(|mut item| {
+                if item.data.is_none() {
+                    item.data = Some(default_data.clone());
+                }
+                item
+            })
+            .collect::<Vec<lsp::CompletionItem>>(),
+        "Items sent for resolve should be unchanged modulo resolve `data` filled with default if missing"
    );
    resolved_items.lock().clear();

@@ -12453,9 +12440,15 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
    // Completions that have already been resolved are skipped.
    assert_eq!(
        *resolved_items.lock(),
-        items_out[items_out.len() - 16..items_out.len() - 4]
+        items[items.len() - 16..items.len() - 4]
            .iter()
            .cloned()
+            .map(|mut item| {
+                if item.data.is_none() {
+                    item.data = Some(default_data.clone());
+                }
+                item
+            })
            .collect::<Vec<lsp::CompletionItem>>()
    );
    resolved_items.lock().clear();
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -20,10 +20,10 @@ use crate::{
    DisplayRow, DocumentHighlightRead, DocumentHighlightWrite, EditDisplayMode, Editor, EditorMode,
    EditorSettings, EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GoToHunk,
    GoToPreviousHunk, GutterDimensions, HalfPageDown, HalfPageUp, HandleInput, HoveredCursor,
-    InlayHintRefreshReason, InlineCompletion, JumpData, LineDown, LineUp, OpenExcerpts, PageDown,
-    PageUp, Point, RowExt, RowRangeExt, SelectPhase, SelectedTextHighlight, Selection, SoftWrap,
-    StickyHeaderExcerpt, ToPoint, ToggleFold, COLUMNAR_SELECTION_MODIFIERS, CURSORS_VISIBLE_FOR,
-    FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
+    InlayHintRefreshReason, InlineCompletion, JumpData, LineDown, LineHighlight, LineUp,
+    OpenExcerpts, PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, SelectedTextHighlight,
+    Selection, SoftWrap, StickyHeaderExcerpt, ToPoint, ToggleFold, COLUMNAR_SELECTION_MODIFIERS,
+    CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
    MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
 };
 use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
@@ -282,7 +282,9 @@ impl EditorElement {
        register_action(editor, window, Editor::move_to_beginning);
        register_action(editor, window, Editor::move_to_end);
        register_action(editor, window, Editor::move_to_start_of_excerpt);
+        register_action(editor, window, Editor::move_to_start_of_next_excerpt);
        register_action(editor, window, Editor::move_to_end_of_excerpt);
+        register_action(editor, window, Editor::move_to_end_of_previous_excerpt);
        register_action(editor, window, Editor::select_up);
        register_action(editor, window, Editor::select_down);
        register_action(editor, window, Editor::select_left);
@@ -296,7 +298,9 @@ impl EditorElement {
        register_action(editor, window, Editor::select_to_start_of_paragraph);
        register_action(editor, window, Editor::select_to_end_of_paragraph);
        register_action(editor, window, Editor::select_to_start_of_excerpt);
+        register_action(editor, window, Editor::select_to_start_of_next_excerpt);
        register_action(editor, window, Editor::select_to_end_of_excerpt);
+        register_action(editor, window, Editor::select_to_end_of_previous_excerpt);
        register_action(editor, window, Editor::select_to_beginning);
        register_action(editor, window, Editor::select_to_end);
        register_action(editor, window, Editor::select_all);
@@ -954,7 +958,6 @@ impl EditorElement {
        cx.notify()
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_selections(
        &self,
        start_anchor: Anchor,
@@ -1126,7 +1129,6 @@ impl EditorElement {
        cursors
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_visible_cursors(
        &self,
        snapshot: &EditorSnapshot,
@@ -1480,7 +1482,6 @@ impl EditorElement {
        axis_pair(horizontal_scrollbar, vertical_scrollbar)
    }

-    #[allow(clippy::too_many_arguments)]
    fn prepaint_crease_toggles(
        &self,
        crease_toggles: &mut [Option<AnyElement>],
@@ -1515,7 +1516,6 @@ impl EditorElement {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    fn prepaint_crease_trailers(
        &self,
        trailers: Vec<Option<AnyElement>>,
@@ -1592,7 +1592,6 @@ impl EditorElement {
        display_hunks
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_inline_diagnostics(
        &self,
        line_layouts: &[LineWithInvisibles],
@@ -1743,7 +1742,6 @@ impl EditorElement {
        elements
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_inline_blame(
        &self,
        display_row: DisplayRow,
@@ -1823,7 +1821,6 @@ impl EditorElement {
        Some(element)
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_blame_entries(
        &self,
        buffer_rows: &[RowInfo],
@@ -1892,7 +1889,6 @@ impl EditorElement {
        Some(shaped_lines)
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_indent_guides(
        &self,
        content_origin: gpui::Point<Pixels>,
@@ -2010,7 +2006,6 @@ impl EditorElement {
        (offset_y, length)
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_run_indicators(
        &self,
        line_height: Pixels,
@@ -2104,7 +2099,6 @@ impl EditorElement {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_code_actions_indicator(
        &self,
        line_height: Pixels,
@@ -2203,7 +2197,6 @@ impl EditorElement {
        relative_rows
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_line_numbers(
        &self,
        gutter_hitbox: Option<&Hitbox>,
@@ -2419,7 +2412,6 @@ impl EditorElement {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    fn prepaint_lines(
        &self,
        start_row: DisplayRow,
@@ -2446,7 +2438,6 @@ impl EditorElement {
        line_elements
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_block(
        &self,
        block: &Block,
@@ -2946,7 +2937,6 @@ impl EditorElement {
        }))
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_blocks(
        &self,
        rows: Range<DisplayRow>,
@@ -3131,7 +3121,6 @@ impl EditorElement {

    /// Returns true if any of the blocks changed size since the previous frame. This will trigger
    /// a restart of rendering for the editor based on the new sizes.
-    #[allow(clippy::too_many_arguments)]
    fn layout_blocks(
        &self,
        blocks: &mut Vec<BlockLayout>,
@@ -3175,7 +3164,6 @@ impl EditorElement {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_sticky_buffer_header(
        &self,
        StickyHeaderExcerpt {
@@ -3250,7 +3238,6 @@ impl EditorElement {
        header
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_cursor_popovers(
        &self,
        line_height: Pixels,
@@ -3439,7 +3426,6 @@ impl EditorElement {
        );
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_gutter_menu(
        &self,
        line_height: Pixels,
@@ -3492,7 +3478,6 @@ impl EditorElement {
        );
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_popovers_above_or_below_line(
        &self,
        target_position: gpui::Point<Pixels>,
@@ -3606,7 +3591,6 @@ impl EditorElement {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_context_menu_aside(
        &self,
        y_flipped: bool,
@@ -3802,7 +3786,6 @@ impl EditorElement {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_hover_popovers(
        &self,
        snapshot: &EditorSnapshot,
@@ -3919,7 +3902,6 @@ impl EditorElement {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_diff_hunk_controls(
        &self,
        row_range: Range<DisplayRow>,
@@ -4004,7 +3986,6 @@ impl EditorElement {
        controls
    }

-    #[allow(clippy::too_many_arguments)]
    fn layout_signature_help(
        &self,
        hitbox: &Hitbox,
@@ -4132,46 +4113,74 @@ impl EditorElement {
                    }
                }

-                let mut paint_highlight =
-                    |highlight_row_start: DisplayRow, highlight_row_end: DisplayRow, color| {
-                        let origin = point(
-                            layout.hitbox.origin.x,
-                            layout.hitbox.origin.y
-                                + (highlight_row_start.as_f32() - scroll_top)
-                                    * layout.position_map.line_height,
-                        );
-                        let size = size(
-                            layout.hitbox.size.width,
-                            layout.position_map.line_height
-                                * highlight_row_end.next_row().minus(highlight_row_start) as f32,
-                        );
-                        window.paint_quad(fill(Bounds { origin, size }, color));
-                    };
+                let mut paint_highlight = |highlight_row_start: DisplayRow,
+                                           highlight_row_end: DisplayRow,
+                                           highlight: crate::LineHighlight,
+                                           edges| {
+                    let origin = point(
+                        layout.hitbox.origin.x,
+                        layout.hitbox.origin.y
+                            + (highlight_row_start.as_f32() - scroll_top)
+                                * layout.position_map.line_height,
+                    );
+                    let size = size(
+                        layout.hitbox.size.width,
+                        layout.position_map.line_height
+                            * highlight_row_end.next_row().minus(highlight_row_start) as f32,
+                    );
+                    let mut quad = fill(Bounds { origin, size }, highlight.background);
+                    if let Some(border_color) = highlight.border {
+                        quad.border_color = border_color;
+                        quad.border_widths = edges
+                    }
+                    window.paint_quad(quad);
+                };

-                let mut current_paint: Option<(gpui::Background, Range<DisplayRow>)> = None;
+                let mut current_paint: Option<(LineHighlight, Range<DisplayRow>, Edges<Pixels>)> =
+                    None;
                for (&new_row, &new_background) in &layout.highlighted_rows {
                    match &mut current_paint {
-                        Some((current_background, current_range)) => {
+                        Some((current_background, current_range, mut edges)) => {
                            let current_background = *current_background;
                            let new_range_started = current_background != new_background
                                || current_range.end.next_row() != new_row;
                            if new_range_started {
+                                if current_range.end.next_row() == new_row {
+                                    edges.bottom = px(0.);
+                                };
                                paint_highlight(
                                    current_range.start,
                                    current_range.end,
                                    current_background,
+                                    edges,
                                );
-                                current_paint = Some((new_background, new_row..new_row));
+                                let edges = Edges {
+                                    top: if current_range.end.next_row() != new_row {
+                                        px(1.)
+                                    } else {
+                                        px(0.)
+                                    },
+                                    bottom: px(1.),
+                                    ..Default::default()
+                                };
+                                current_paint = Some((new_background, new_row..new_row, edges));
                                continue;
                            } else {
                                current_range.end = current_range.end.next_row();
                            }
                        }
-                        None => current_paint = Some((new_background, new_row..new_row)),
+                        None => {
+                            let edges = Edges {
+                                top: px(1.),
+                                bottom: px(1.),
+                                ..Default::default()
+                            };
+                            current_paint = Some((new_background, new_row..new_row, edges))
+                        }
                    };
                }
-                if let Some((color, range)) = current_paint {
-                    paint_highlight(range.start, range.end, color);
+                if let Some((color, range, edges)) = current_paint {
+                    paint_highlight(range.start, range.end, color, edges);
                }

                let scroll_left =
@@ -4431,6 +4440,9 @@ impl EditorElement {
                                    background_color.opacity(if is_light { 0.2 } else { 0.32 });
                            }
                        }
+                        GitHunkStyleSetting::StagedBorder | GitHunkStyleSetting::Border => {
+                            // Don't change the background color
+                        }
                    }

                    // Flatten the background color with the editor color to prevent
@@ -4641,6 +4653,7 @@ impl EditorElement {
                };
                window.set_cursor_style(cursor_style, &layout.position_map.text_hitbox);

+                self.paint_lines_background(layout, window, cx);
                let invisible_display_ranges = self.paint_highlights(layout, window);
                self.paint_lines(&invisible_display_ranges, layout, window, cx);
                self.paint_redactions(layout, window);
@@ -4731,6 +4744,18 @@ impl EditorElement {
        }
    }

+    fn paint_lines_background(
+        &mut self,
+        layout: &mut EditorLayout,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        for (ix, line_with_invisibles) in layout.position_map.line_layouts.iter().enumerate() {
+            let row = DisplayRow(layout.visible_display_row_range.start.0 + ix as u32);
+            line_with_invisibles.draw_background(layout, row, layout.content_origin, window, cx);
+        }
+    }
+
    fn paint_redactions(&mut self, layout: &EditorLayout, window: &mut Window) {
        if layout.redacted_ranges.is_empty() {
            return;
@@ -5269,7 +5294,6 @@ impl EditorElement {
        });
    }

-    #[allow(clippy::too_many_arguments)]
    fn paint_highlighted_range(
        &self,
        range: Range<DisplayPoint>,
@@ -5695,7 +5719,6 @@ impl AcceptEditPredictionBinding {
    }
 }

-#[allow(clippy::too_many_arguments)]
 fn prepaint_gutter_button(
    button: IconButton,
    row: DisplayRow,
@@ -5946,7 +5969,6 @@ impl fmt::Debug for LineFragment {
 }

 impl LineWithInvisibles {
-    #[allow(clippy::too_many_arguments)]
    fn from_chunks<'a>(
        chunks: impl Iterator<Item = HighlightedChunk<'a>>,
        editor_style: &EditorStyle,
@@ -6151,7 +6173,6 @@ impl LineWithInvisibles {
        layouts
    }

-    #[allow(clippy::too_many_arguments)]
    fn prepaint(
        &mut self,
        line_height: Pixels,
@@ -6186,7 +6207,6 @@ impl LineWithInvisibles {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    fn draw(
        &self,
        layout: &EditorLayout,
@@ -6230,7 +6250,35 @@ impl LineWithInvisibles {
        );
    }

-    #[allow(clippy::too_many_arguments)]
+    fn draw_background(
+        &self,
+        layout: &EditorLayout,
+        row: DisplayRow,
+        content_origin: gpui::Point<Pixels>,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        let line_height = layout.position_map.line_height;
+        let line_y = line_height
+            * (row.as_f32() - layout.position_map.scroll_pixel_position.y / line_height);
+
+        let mut fragment_origin =
+            content_origin + gpui::point(-layout.position_map.scroll_pixel_position.x, line_y);
+
+        for fragment in &self.fragments {
+            match fragment {
+                LineFragment::Text(line) => {
+                    line.paint_background(fragment_origin, line_height, window, cx)
+                        .log_err();
+                    fragment_origin.x += line.width;
+                }
+                LineFragment::Element { size, .. } => {
+                    fragment_origin.x += size.width;
+                }
+            }
+        }
+    }
+
    fn draw_invisibles(
        &self,
        selection_ranges: &[Range<DisplayPoint>],
@@ -6775,12 +6823,15 @@ impl Element for EditorElement {
                        let hunk_opacity = if is_light { 0.16 } else { 0.12 };
                        let slash_width = line_height.0 / 1.5; // ~16 by default

-                        let staged_background = match hunk_style {
-                            GitHunkStyleSetting::Transparent | GitHunkStyleSetting::Pattern => {
-                                solid_background(background_color.opacity(hunk_opacity))
+                        let staged_highlight: LineHighlight = match hunk_style {
+                            GitHunkStyleSetting::Transparent
+                            | GitHunkStyleSetting::Pattern
+                            | GitHunkStyleSetting::Border => {
+                                solid_background(background_color.opacity(hunk_opacity)).into()
                            }
                            GitHunkStyleSetting::StagedPattern => {
                                pattern_slash(background_color.opacity(hunk_opacity), slash_width)
+                                    .into()
                            }
                            GitHunkStyleSetting::StagedTransparent => {
                                solid_background(background_color.opacity(if is_light {
@@ -6788,30 +6839,56 @@ impl Element for EditorElement {
                                } else {
                                    0.04
                                }))
+                                .into()
                            }
+                            GitHunkStyleSetting::StagedBorder => LineHighlight {
+                                background: (background_color.opacity(if is_light {
+                                    0.08
+                                } else {
+                                    0.06
+                                }))
+                                .into(),
+                                border: Some(if is_light {
+                                    background_color.opacity(0.48)
+                                } else {
+                                    background_color.opacity(0.36)
+                                }),
+                            },
                        };

-                        let unstaged_background = match hunk_style {
+                        let unstaged_highlight = match hunk_style {
                            GitHunkStyleSetting::Transparent => {
                                solid_background(background_color.opacity(if is_light {
                                    0.08
                                } else {
                                    0.04
                                }))
+                                .into()
                            }
                            GitHunkStyleSetting::Pattern => {
                                pattern_slash(background_color.opacity(hunk_opacity), slash_width)
+                                    .into()
                            }
+                            GitHunkStyleSetting::Border => LineHighlight {
+                                background: (background_color.opacity(if is_light {
+                                    0.08
+                                } else {
+                                    0.02
+                                }))
+                                .into(),
+                                border: Some(background_color.opacity(0.5)),
+                            },
                            GitHunkStyleSetting::StagedPattern
-                            | GitHunkStyleSetting::StagedTransparent => {
-                                solid_background(background_color.opacity(hunk_opacity))
+                            | GitHunkStyleSetting::StagedTransparent
+                            | GitHunkStyleSetting::StagedBorder => {
+                                solid_background(background_color.opacity(hunk_opacity)).into()
                            }
                        };

                        let background = if unstaged {
-                            unstaged_background
+                            unstaged_highlight
                        } else {
-                            staged_background
+                            staged_highlight
                        };

                        highlighted_rows
@@ -7595,7 +7672,6 @@ struct ScrollbarRangeData {
 }

 impl ScrollbarRangeData {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        scrollbar_bounds: Bounds<Pixels>,
        letter_size: Size<Pixels>,
@@ -7660,7 +7736,7 @@ pub struct EditorLayout {
    indent_guides: Option<Vec<IndentGuideLayout>>,
    visible_display_row_range: Range<DisplayRow>,
    active_rows: BTreeMap<DisplayRow, bool>,
-    highlighted_rows: BTreeMap<DisplayRow, gpui::Background>,
+    highlighted_rows: BTreeMap<DisplayRow, LineHighlight>,
    line_elements: SmallVec<[AnyElement; 1]>,
    line_numbers: Arc<HashMap<MultiBufferRow, LineNumberLayout>>,
    display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)>,
@@ -8832,14 +8908,16 @@ fn diff_hunk_controls(
        .h(line_height)
        .mr_1()
        .gap_1()
-        .px_1()
+        .px_0p5()
        .pb_1()
+        .border_x_1()
        .border_b_1()
        .border_color(cx.theme().colors().border_variant)
        .rounded_b_lg()
        .bg(cx.theme().colors().editor_background)
        .gap_1()
        .occlude()
+        .shadow_md()
        .child(if status.has_secondary_hunk() {
            Button::new(("stage", row as u64), "Stage")
                .alpha(if status.is_pending() { 0.66 } else { 1.0 })
@@ -8896,7 +8974,7 @@ fn diff_hunk_controls(
                })
        })
        .child(
-            Button::new("discard", "Restore")
+            Button::new("restore", "Restore")
                .tooltip({
                    let focus_handle = editor.focus_handle(cx);
                    move |window, cx| {
@@ -8948,7 +9026,7 @@ fn diff_hunk_controls(
                                    let snapshot = editor.snapshot(window, cx);
                                    let position =
                                        hunk_range.end.to_point(&snapshot.buffer_snapshot);
-                                    editor.go_to_hunk_after_or_before_position(
+                                    editor.go_to_hunk_before_or_after_position(
                                        &snapshot,
                                        position,
                                        Direction::Next,
@@ -8984,7 +9062,7 @@ fn diff_hunk_controls(
                                    let snapshot = editor.snapshot(window, cx);
                                    let point =
                                        hunk_range.start.to_point(&snapshot.buffer_snapshot);
-                                    editor.go_to_hunk_after_or_before_position(
+                                    editor.go_to_hunk_before_or_after_position(
                                        &snapshot,
                                        point,
                                        Direction::Prev,
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -370,7 +370,6 @@ impl GitBlame {
                    async move {
                        let Some(Blame {
                            entries,
-                            permalinks,
                            messages,
                            remote_url,
                        }) = blame.await?
@@ -379,13 +378,8 @@ impl GitBlame {
                        };

                        let entries = build_blame_entry_sum_tree(entries, snapshot.max_point().row);
-                        let commit_details = parse_commit_messages(
-                            messages,
-                            remote_url,
-                            &permalinks,
-                            provider_registry,
-                        )
-                        .await;
+                        let commit_details =
+                            parse_commit_messages(messages, remote_url, provider_registry).await;

                        anyhow::Ok(Some((entries, commit_details)))
                    }
@@ -477,7 +471,6 @@ fn build_blame_entry_sum_tree(entries: Vec<BlameEntry>, max_row: u32) -> SumTree
 async fn parse_commit_messages(
    messages: impl IntoIterator<Item = (Oid, String)>,
    remote_url: Option<String>,
-    deprecated_permalinks: &HashMap<Oid, Url>,
    provider_registry: Arc<GitHostingProviderRegistry>,
 ) -> HashMap<Oid, ParsedCommitMessage> {
    let mut commit_details = HashMap::default();
@@ -495,11 +488,7 @@ async fn parse_commit_messages(
                },
            ))
        } else {
-            // DEPRECATED (18 Apr 24): Sending permalinks over the wire is deprecated. Clients
-            // now do the parsing. This is here for backwards compatibility, so that
-            // when an old peer sends a client no `parsed_remote_url` but `deprecated_permalinks`,
-            // we fall back to that.
-            deprecated_permalinks.get(&oid).cloned()
+            continue;
        };

        let remote = parsed_remote_url
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -448,7 +448,9 @@ pub fn end_of_excerpt(
            if start.row() > DisplayRow(0) {
                *start.row_mut() -= 1;
            }
-            map.clip_point(start, Bias::Left)
+            start = map.clip_point(start, Bias::Left);
+            *start.column_mut() = 0;
+            start
        }
        Direction::Next => {
            let mut end = excerpt.end_anchor().to_display_point(&map);
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -223,7 +223,6 @@ impl ScrollManager {
        self.anchor.scroll_position(snapshot)
    }

-    #[allow(clippy::too_many_arguments)]
    fn set_scroll_position(
        &mut self,
        scroll_position: gpui::Point<f32>,
@@ -298,7 +297,6 @@ impl ScrollManager {
        );
    }

-    #[allow(clippy::too_many_arguments)]
    fn set_anchor(
        &mut self,
        anchor: ScrollAnchor,
--- a/crates/evals/Cargo.toml
+++ b/crates/evals/Cargo.toml
@@ -22,7 +22,6 @@ collections.workspace = true
 env_logger.workspace = true
 feature_flags.workspace = true
 fs.workspace = true
-git.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 language.workspace = true
--- a/crates/evals/src/eval.rs
+++ b/crates/evals/src/eval.rs
@@ -5,7 +5,6 @@ use client::{Client, UserStore};
 use clock::RealSystemClock;
 use collections::BTreeMap;
 use feature_flags::FeatureFlagAppExt as _;
-use git::GitHostingProviderRegistry;
 use gpui::{AppContext as _, AsyncApp, BackgroundExecutor, Entity};
 use http_client::{HttpClient, Method};
 use language::LanguageRegistry;
@@ -274,8 +273,7 @@ async fn run_evaluation(
    let repos_dir = Path::new(EVAL_REPOS_DIR);
    let db_path = Path::new(EVAL_DB_PATH);
    let api_key = std::env::var("OPENAI_API_KEY").unwrap();
-    let git_hosting_provider_registry = Arc::new(GitHostingProviderRegistry::new());
-    let fs = Arc::new(RealFs::new(git_hosting_provider_registry, None)) as Arc<dyn Fs>;
+    let fs = Arc::new(RealFs::new(None)) as Arc<dyn Fs>;
    let clock = Arc::new(RealSystemClock);
    let client = cx
        .update(|cx| {
@@ -399,7 +397,6 @@ async fn run_evaluation(
    }
 }

-#[allow(clippy::too_many_arguments)]
 async fn run_eval_project(
    evaluation_project: EvaluationProject,
    user_store: &Entity<UserStore>,
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -17,6 +17,7 @@ async-compression.workspace = true
 async-tar.workspace = true
 async-trait.workspace = true
 collections.workspace = true
+convert_case.workspace = true
 fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -4,6 +4,7 @@ use crate::{
 use anyhow::{anyhow, bail, Context as _, Result};
 use async_compression::futures::bufread::GzipDecoder;
 use async_tar::Archive;
+use convert_case::{Case, Casing as _};
 use futures::io::BufReader;
 use futures::AsyncReadExt;
 use http_client::{self, AsyncBody, HttpClient};
@@ -97,6 +98,11 @@ impl ExtensionBuilder {
        }

        for (grammar_name, grammar_metadata) in &extension_manifest.grammars {
+            let snake_cased_grammar_name = grammar_name.to_case(Case::Snake);
+            if grammar_name.as_ref() != snake_cased_grammar_name.as_str() {
+                bail!("grammar name '{grammar_name}' must be written in snake_case: {snake_cased_grammar_name}");
+            }
+
            log::info!(
                "compiling grammar {grammar_name} for extension {}",
                extension_dir.display()
--- a/crates/extension_api/src/extension_api.rs
+++ b/crates/extension_api/src/extension_api.rs
@@ -195,7 +195,6 @@ static mut EXTENSION: Option<Box<dyn Extension>> = None;
 pub static ZED_API_VERSION: [u8; 6] = *include_bytes!(concat!(env!("OUT_DIR"), "/version_bytes"));

 mod wit {
-    #![allow(clippy::too_many_arguments, clippy::missing_safety_doc)]

    wit_bindgen::generate!({
        skip: ["init-extension"],
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -218,7 +218,6 @@ impl ExtensionStore {
        cx.global::<GlobalExtensionStore>().0.clone()
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        extensions_dir: PathBuf,
        build_dir: Option<PathBuf>,
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -80,11 +80,6 @@ impl FeatureFlag for PredictEditsNonEagerModeFeatureFlag {
    }
 }

-pub struct GitUiFeatureFlag;
-impl FeatureFlag for GitUiFeatureFlag {
-    const NAME: &'static str = "git-ui";
-}
-
 pub struct Remoting {}
 impl FeatureFlag for Remoting {
    const NAME: &'static str = "remoting";
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -653,7 +653,6 @@ impl FileSearchQuery {
 }

 impl FileFinderDelegate {
-    #[allow(clippy::too_many_arguments)]
    fn new(
        file_finder: WeakEntity<FileFinder>,
        workspace: WeakEntity<Workspace>,
--- a/crates/file_finder/src/new_path_prompt.rs
+++ b/crates/file_finder/src/new_path_prompt.rs
@@ -436,8 +436,8 @@ impl PickerDelegate for NewPathDelegate {
        )
    }

-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
-        "Type a path...".into()
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+        Some("Type a path...".into())
    }

    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -347,12 +347,14 @@ impl PickerDelegate for OpenPathDelegate {
        )
    }

-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
-        if let Some(error) = self.directory_state.as_ref().and_then(|s| s.error.clone()) {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+        let text = if let Some(error) = self.directory_state.as_ref().and_then(|s| s.error.clone())
+        {
            error
        } else {
            "No such file or directory".into()
-        }
+        };
+        Some(text)
    }

    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -11,7 +11,6 @@ use collections::HashMap;
 use git::status::StatusCode;
 #[cfg(any(test, feature = "test-support"))]
 use git::status::TrackedStatus;
-use git::GitHostingProviderRegistry;
 #[cfg(any(test, feature = "test-support"))]
 use git::{repository::RepoPath, status::FileStatus};

@@ -247,7 +246,6 @@ impl From<MTime> for proto::Timestamp {

 #[derive(Default)]
 pub struct RealFs {
-    git_hosting_provider_registry: Arc<GitHostingProviderRegistry>,
    git_binary_path: Option<PathBuf>,
 }

@@ -300,14 +298,8 @@ impl FileHandle for std::fs::File {
 pub struct RealWatcher {}

 impl RealFs {
-    pub fn new(
-        git_hosting_provider_registry: Arc<GitHostingProviderRegistry>,
-        git_binary_path: Option<PathBuf>,
-    ) -> Self {
-        Self {
-            git_hosting_provider_registry,
-            git_binary_path,
-        }
+    pub fn new(git_binary_path: Option<PathBuf>) -> Self {
+        Self { git_binary_path }
    }
 }

@@ -770,7 +762,6 @@ impl Fs for RealFs {
        Some(Arc::new(RealGitRepository::new(
            repo,
            self.git_binary_path.clone(),
-            self.git_hosting_provider_registry.clone(),
        )))
    }

--- a/crates/fuzzy/src/matcher.rs
+++ b/crates/fuzzy/src/matcher.rs
@@ -170,7 +170,6 @@ impl<'a> Matcher<'a> {
        score
    }

-    #[allow(clippy::too_many_arguments)]
    fn recursive_score_match(
        &mut self,
        path: &[char],
--- a/crates/git/src/blame.rs
+++ b/crates/git/src/blame.rs
@@ -1,17 +1,15 @@
 use crate::commit::get_messages;
-use crate::{parse_git_remote_url, BuildCommitPermalinkParams, GitHostingProviderRegistry, Oid};
+use crate::Oid;
 use anyhow::{anyhow, Context as _, Result};
 use collections::{HashMap, HashSet};
 use serde::{Deserialize, Serialize};
 use std::io::Write;
 use std::process::Stdio;
-use std::sync::Arc;
 use std::{ops::Range, path::Path};
 use text::Rope;
 use time::macros::format_description;
 use time::OffsetDateTime;
 use time::UtcOffset;
-use url::Url;

 pub use git2 as libgit;

@@ -19,7 +17,6 @@ pub use git2 as libgit;
 pub struct Blame {
    pub entries: Vec<BlameEntry>,
    pub messages: HashMap<Oid, String>,
-    pub permalinks: HashMap<Oid, Url>,
    pub remote_url: Option<String>,
 }

@@ -30,32 +27,15 @@ impl Blame {
        path: &Path,
        content: &Rope,
        remote_url: Option<String>,
-        provider_registry: Arc<GitHostingProviderRegistry>,
    ) -> Result<Self> {
        let output = run_git_blame(git_binary, working_directory, path, content)?;
        let mut entries = parse_git_blame(&output)?;
        entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start));

-        let mut permalinks = HashMap::default();
        let mut unique_shas = HashSet::default();
-        let parsed_remote_url = remote_url
-            .as_deref()
-            .and_then(|remote_url| parse_git_remote_url(provider_registry, remote_url));

        for entry in entries.iter_mut() {
            unique_shas.insert(entry.sha);
-            // DEPRECATED (18 Apr 24): Sending permalinks over the wire is deprecated. Clients
-            // now do the parsing.
-            if let Some((provider, remote)) = parsed_remote_url.as_ref() {
-                permalinks.entry(entry.sha).or_insert_with(|| {
-                    provider.build_commit_permalink(
-                        remote,
-                        BuildCommitPermalinkParams {
-                            sha: entry.sha.to_string().as_str(),
-                        },
-                    )
-                });
-            }
        }

        let shas = unique_shas.into_iter().collect::<Vec<_>>();
@@ -64,7 +44,6 @@ impl Blame {

        Ok(Self {
            entries,
-            permalinks,
            messages,
            remote_url,
        })
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1,5 +1,5 @@
 use crate::status::FileStatus;
-use crate::GitHostingProviderRegistry;
+use crate::SHORT_SHA_LENGTH;
 use crate::{blame::Blame, status::GitStatus};
 use anyhow::{anyhow, Context, Result};
 use askpass::{AskPassResult, AskPassSession};
@@ -57,6 +57,14 @@ pub struct Upstream {
    pub tracking: UpstreamTracking,
 }

+impl Upstream {
+    pub fn remote_name(&self) -> Option<&str> {
+        self.ref_name
+            .strip_prefix("refs/remotes/")
+            .and_then(|stripped| stripped.split("/").next())
+    }
+}
+
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
 pub enum UpstreamTracking {
    /// Remote ref not present in local repository.
@@ -120,6 +128,12 @@ pub struct CommitDetails {
    pub committer_name: SharedString,
 }

+impl CommitDetails {
+    pub fn short_sha(&self) -> SharedString {
+        self.sha[..SHORT_SHA_LENGTH].to_string().into()
+    }
+}
+
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub struct Remote {
    pub name: SharedString,
@@ -149,7 +163,12 @@ pub trait GitRepository: Send + Sync {
    /// Also returns `None` for symlinks.
    fn load_committed_text(&self, path: &RepoPath) -> Option<String>;

-    fn set_index_text(&self, path: &RepoPath, content: Option<String>) -> anyhow::Result<()>;
+    fn set_index_text(
+        &self,
+        path: &RepoPath,
+        content: Option<String>,
+        env: &HashMap<String, String>,
+    ) -> anyhow::Result<()>;

    /// Returns the URL of the remote with the given name.
    fn remote_url(&self, name: &str) -> Option<String>;
@@ -167,8 +186,13 @@ pub trait GitRepository: Send + Sync {
    fn create_branch(&self, _: &str) -> Result<()>;
    fn branch_exits(&self, _: &str) -> Result<bool>;

-    fn reset(&self, commit: &str, mode: ResetMode) -> Result<()>;
-    fn checkout_files(&self, commit: &str, paths: &[RepoPath]) -> Result<()>;
+    fn reset(&self, commit: &str, mode: ResetMode, env: &HashMap<String, String>) -> Result<()>;
+    fn checkout_files(
+        &self,
+        commit: &str,
+        paths: &[RepoPath],
+        env: &HashMap<String, String>,
+    ) -> Result<()>;

    fn show(&self, commit: &str) -> Result<CommitDetails>;

@@ -189,13 +213,18 @@ pub trait GitRepository: Send + Sync {
    /// Updates the index to match the worktree at the given paths.
    ///
    /// If any of the paths have been deleted from the worktree, they will be removed from the index if found there.
-    fn stage_paths(&self, paths: &[RepoPath]) -> Result<()>;
+    fn stage_paths(&self, paths: &[RepoPath], env: &HashMap<String, String>) -> Result<()>;
    /// Updates the index to match HEAD at the given paths.
    ///
    /// If any of the paths were previously staged but do not exist in HEAD, they will be removed from the index.
-    fn unstage_paths(&self, paths: &[RepoPath]) -> Result<()>;
+    fn unstage_paths(&self, paths: &[RepoPath], env: &HashMap<String, String>) -> Result<()>;

-    fn commit(&self, message: &str, name_and_email: Option<(&str, &str)>) -> Result<()>;
+    fn commit(
+        &self,
+        message: &str,
+        name_and_email: Option<(&str, &str)>,
+        env: &HashMap<String, String>,
+    ) -> Result<()>;

    fn push(
        &self,
@@ -203,6 +232,7 @@ pub trait GitRepository: Send + Sync {
        upstream_name: &str,
        options: Option<PushOptions>,
        askpass: AskPassSession,
+        env: &HashMap<String, String>,
    ) -> Result<RemoteCommandOutput>;

    fn pull(
@@ -210,8 +240,13 @@ pub trait GitRepository: Send + Sync {
        branch_name: &str,
        upstream_name: &str,
        askpass: AskPassSession,
+        env: &HashMap<String, String>,
+    ) -> Result<RemoteCommandOutput>;
+    fn fetch(
+        &self,
+        askpass: AskPassSession,
+        env: &HashMap<String, String>,
    ) -> Result<RemoteCommandOutput>;
-    fn fetch(&self, askpass: AskPassSession) -> Result<RemoteCommandOutput>;

    fn get_remotes(&self, branch_name: Option<&str>) -> Result<Vec<Remote>>;

@@ -242,19 +277,13 @@ impl std::fmt::Debug for dyn GitRepository {
 pub struct RealGitRepository {
    pub repository: Mutex<git2::Repository>,
    pub git_binary_path: PathBuf,
-    hosting_provider_registry: Arc<GitHostingProviderRegistry>,
 }

 impl RealGitRepository {
-    pub fn new(
-        repository: git2::Repository,
-        git_binary_path: Option<PathBuf>,
-        hosting_provider_registry: Arc<GitHostingProviderRegistry>,
-    ) -> Self {
+    pub fn new(repository: git2::Repository, git_binary_path: Option<PathBuf>) -> Self {
        Self {
            repository: Mutex::new(repository),
            git_binary_path: git_binary_path.unwrap_or_else(|| PathBuf::from("git")),
-            hosting_provider_registry,
        }
    }

@@ -308,7 +337,7 @@ impl GitRepository for RealGitRepository {
        Ok(details)
    }

-    fn reset(&self, commit: &str, mode: ResetMode) -> Result<()> {
+    fn reset(&self, commit: &str, mode: ResetMode, env: &HashMap<String, String>) -> Result<()> {
        let working_directory = self.working_directory()?;

        let mode_flag = match mode {
@@ -317,6 +346,7 @@ impl GitRepository for RealGitRepository {
        };

        let output = new_std_command(&self.git_binary_path)
+            .envs(env)
            .current_dir(&working_directory)
            .args(["reset", mode_flag, commit])
            .output()?;
@@ -329,7 +359,12 @@ impl GitRepository for RealGitRepository {
        Ok(())
    }

-    fn checkout_files(&self, commit: &str, paths: &[RepoPath]) -> Result<()> {
+    fn checkout_files(
+        &self,
+        commit: &str,
+        paths: &[RepoPath],
+        env: &HashMap<String, String>,
+    ) -> Result<()> {
        if paths.is_empty() {
            return Ok(());
        }
@@ -337,6 +372,7 @@ impl GitRepository for RealGitRepository {

        let output = new_std_command(&self.git_binary_path)
            .current_dir(&working_directory)
+            .envs(env)
            .args(["checkout", commit, "--"])
            .args(paths.iter().map(|path| path.as_ref()))
            .output()?;
@@ -385,11 +421,17 @@ impl GitRepository for RealGitRepository {
        Some(content)
    }

-    fn set_index_text(&self, path: &RepoPath, content: Option<String>) -> anyhow::Result<()> {
+    fn set_index_text(
+        &self,
+        path: &RepoPath,
+        content: Option<String>,
+        env: &HashMap<String, String>,
+    ) -> anyhow::Result<()> {
        let working_directory = self.working_directory()?;
        if let Some(content) = content {
            let mut child = new_std_command(&self.git_binary_path)
                .current_dir(&working_directory)
+                .envs(env)
                .args(["hash-object", "-w", "--stdin"])
                .stdin(Stdio::piped())
                .stdout(Stdio::piped())
@@ -402,6 +444,7 @@ impl GitRepository for RealGitRepository {

            let output = new_std_command(&self.git_binary_path)
                .current_dir(&working_directory)
+                .envs(env)
                .args(["update-index", "--add", "--cacheinfo", "100644", &sha])
                .arg(path.as_ref())
                .output()?;
@@ -415,6 +458,7 @@ impl GitRepository for RealGitRepository {
        } else {
            let output = new_std_command(&self.git_binary_path)
                .current_dir(&working_directory)
+                .envs(env)
                .args(["update-index", "--force-remove"])
                .arg(path.as_ref())
                .output()?;
@@ -581,7 +625,6 @@ impl GitRepository for RealGitRepository {
            path,
            &content,
            remote_url,
-            self.hosting_provider_registry.clone(),
        )
    }

@@ -607,12 +650,13 @@ impl GitRepository for RealGitRepository {
        Ok(String::from_utf8_lossy(&output.stdout).to_string())
    }

-    fn stage_paths(&self, paths: &[RepoPath]) -> Result<()> {
+    fn stage_paths(&self, paths: &[RepoPath], env: &HashMap<String, String>) -> Result<()> {
        let working_directory = self.working_directory()?;

        if !paths.is_empty() {
            let output = new_std_command(&self.git_binary_path)
                .current_dir(&working_directory)
+                .envs(env)
                .args(["update-index", "--add", "--remove", "--"])
                .args(paths.iter().map(|p| p.as_ref()))
                .output()?;
@@ -627,12 +671,13 @@ impl GitRepository for RealGitRepository {
        Ok(())
    }

-    fn unstage_paths(&self, paths: &[RepoPath]) -> Result<()> {
+    fn unstage_paths(&self, paths: &[RepoPath], env: &HashMap<String, String>) -> Result<()> {
        let working_directory = self.working_directory()?;

        if !paths.is_empty() {
            let output = new_std_command(&self.git_binary_path)
                .current_dir(&working_directory)
+                .envs(env)
                .args(["reset", "--quiet", "--"])
                .args(paths.iter().map(|p| p.as_ref()))
                .output()?;
@@ -647,11 +692,17 @@ impl GitRepository for RealGitRepository {
        Ok(())
    }

-    fn commit(&self, message: &str, name_and_email: Option<(&str, &str)>) -> Result<()> {
+    fn commit(
+        &self,
+        message: &str,
+        name_and_email: Option<(&str, &str)>,
+        env: &HashMap<String, String>,
+    ) -> Result<()> {
        let working_directory = self.working_directory()?;

        let mut cmd = new_std_command(&self.git_binary_path);
        cmd.current_dir(&working_directory)
+            .envs(env)
            .args(["commit", "--quiet", "-m"])
            .arg(message)
            .arg("--cleanup=strip");
@@ -677,11 +728,13 @@ impl GitRepository for RealGitRepository {
        remote_name: &str,
        options: Option<PushOptions>,
        ask_pass: AskPassSession,
+        env: &HashMap<String, String>,
    ) -> Result<RemoteCommandOutput> {
        let working_directory = self.working_directory()?;

        let mut command = new_smol_command("git");
        command
+            .envs(env)
            .env("GIT_ASKPASS", ask_pass.script_path())
            .env("SSH_ASKPASS", ask_pass.script_path())
            .env("SSH_ASKPASS_REQUIRE", "force")
@@ -692,7 +745,9 @@ impl GitRepository for RealGitRepository {
                PushOptions::Force => "--force-with-lease",
            }))
            .arg(remote_name)
-            .arg(format!("{}:{}", branch_name, branch_name));
+            .arg(format!("{}:{}", branch_name, branch_name))
+            .stdout(smol::process::Stdio::piped())
+            .stderr(smol::process::Stdio::piped());
        let git_process = command.spawn()?;

        run_remote_command(ask_pass, git_process)
@@ -703,33 +758,44 @@ impl GitRepository for RealGitRepository {
        branch_name: &str,
        remote_name: &str,
        ask_pass: AskPassSession,
+        env: &HashMap<String, String>,
    ) -> Result<RemoteCommandOutput> {
        let working_directory = self.working_directory()?;

        let mut command = new_smol_command("git");
        command
+            .envs(env)
            .env("GIT_ASKPASS", ask_pass.script_path())
            .env("SSH_ASKPASS", ask_pass.script_path())
            .env("SSH_ASKPASS_REQUIRE", "force")
            .current_dir(&working_directory)
            .args(["pull"])
            .arg(remote_name)
-            .arg(branch_name);
+            .arg(branch_name)
+            .stdout(smol::process::Stdio::piped())
+            .stderr(smol::process::Stdio::piped());
        let git_process = command.spawn()?;

        run_remote_command(ask_pass, git_process)
    }

-    fn fetch(&self, ask_pass: AskPassSession) -> Result<RemoteCommandOutput> {
+    fn fetch(
+        &self,
+        ask_pass: AskPassSession,
+        env: &HashMap<String, String>,
+    ) -> Result<RemoteCommandOutput> {
        let working_directory = self.working_directory()?;

        let mut command = new_smol_command("git");
        command
+            .envs(env)
            .env("GIT_ASKPASS", ask_pass.script_path())
            .env("SSH_ASKPASS", ask_pass.script_path())
            .env("SSH_ASKPASS_REQUIRE", "force")
            .current_dir(&working_directory)
-            .args(["fetch", "--all"]);
+            .args(["fetch", "--all"])
+            .stdout(smol::process::Stdio::piped())
+            .stderr(smol::process::Stdio::piped());
        let git_process = command.spawn()?;

        run_remote_command(ask_pass, git_process)
@@ -913,7 +979,12 @@ impl GitRepository for FakeGitRepository {
        state.head_contents.get(path.as_ref()).cloned()
    }

-    fn set_index_text(&self, path: &RepoPath, content: Option<String>) -> anyhow::Result<()> {
+    fn set_index_text(
+        &self,
+        path: &RepoPath,
+        content: Option<String>,
+        _env: &HashMap<String, String>,
+    ) -> anyhow::Result<()> {
        let mut state = self.state.lock();
        if let Some(message) = state.simulated_index_write_error_message.clone() {
            return Err(anyhow::anyhow!(message));
@@ -946,11 +1017,11 @@ impl GitRepository for FakeGitRepository {
        unimplemented!()
    }

-    fn reset(&self, _: &str, _: ResetMode) -> Result<()> {
+    fn reset(&self, _: &str, _: ResetMode, _: &HashMap<String, String>) -> Result<()> {
        unimplemented!()
    }

-    fn checkout_files(&self, _: &str, _: &[RepoPath]) -> Result<()> {
+    fn checkout_files(&self, _: &str, _: &[RepoPath], _: &HashMap<String, String>) -> Result<()> {
        unimplemented!()
    }

@@ -1036,15 +1107,20 @@ impl GitRepository for FakeGitRepository {
            .cloned()
    }

-    fn stage_paths(&self, _paths: &[RepoPath]) -> Result<()> {
+    fn stage_paths(&self, _paths: &[RepoPath], _env: &HashMap<String, String>) -> Result<()> {
        unimplemented!()
    }

-    fn unstage_paths(&self, _paths: &[RepoPath]) -> Result<()> {
+    fn unstage_paths(&self, _paths: &[RepoPath], _env: &HashMap<String, String>) -> Result<()> {
        unimplemented!()
    }

-    fn commit(&self, _message: &str, _name_and_email: Option<(&str, &str)>) -> Result<()> {
+    fn commit(
+        &self,
+        _message: &str,
+        _name_and_email: Option<(&str, &str)>,
+        _env: &HashMap<String, String>,
+    ) -> Result<()> {
        unimplemented!()
    }

@@ -1054,6 +1130,7 @@ impl GitRepository for FakeGitRepository {
        _remote: &str,
        _options: Option<PushOptions>,
        _ask_pass: AskPassSession,
+        _env: &HashMap<String, String>,
    ) -> Result<RemoteCommandOutput> {
        unimplemented!()
    }
@@ -1063,11 +1140,16 @@ impl GitRepository for FakeGitRepository {
        _branch: &str,
        _remote: &str,
        _ask_pass: AskPassSession,
+        _env: &HashMap<String, String>,
    ) -> Result<RemoteCommandOutput> {
        unimplemented!()
    }

-    fn fetch(&self, _ask_pass: AskPassSession) -> Result<RemoteCommandOutput> {
+    fn fetch(
+        &self,
+        _ask_pass: AskPassSession,
+        _env: &HashMap<String, String>,
+    ) -> Result<RemoteCommandOutput> {
        unimplemented!()
    }

--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -54,6 +54,39 @@ impl From<TrackedStatus> for FileStatus {
    }
 }

+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum StageStatus {
+    Staged,
+    Unstaged,
+    PartiallyStaged,
+}
+
+impl StageStatus {
+    pub fn is_fully_staged(&self) -> bool {
+        matches!(self, StageStatus::Staged)
+    }
+
+    pub fn is_fully_unstaged(&self) -> bool {
+        matches!(self, StageStatus::Unstaged)
+    }
+
+    pub fn has_staged(&self) -> bool {
+        matches!(self, StageStatus::Staged | StageStatus::PartiallyStaged)
+    }
+
+    pub fn has_unstaged(&self) -> bool {
+        matches!(self, StageStatus::Unstaged | StageStatus::PartiallyStaged)
+    }
+
+    pub fn as_bool(self) -> Option<bool> {
+        match self {
+            StageStatus::Staged => Some(true),
+            StageStatus::Unstaged => Some(false),
+            StageStatus::PartiallyStaged => None,
+        }
+    }
+}
+
 impl FileStatus {
    pub const fn worktree(worktree_status: StatusCode) -> Self {
        FileStatus::Tracked(TrackedStatus {
@@ -106,15 +139,15 @@ impl FileStatus {
        Ok(status)
    }

-    pub fn is_staged(self) -> Option<bool> {
+    pub fn staging(self) -> StageStatus {
        match self {
            FileStatus::Untracked | FileStatus::Ignored | FileStatus::Unmerged { .. } => {
-                Some(false)
+                StageStatus::Unstaged
            }
            FileStatus::Tracked(tracked) => match (tracked.index_status, tracked.worktree_status) {
-                (StatusCode::Unmodified, _) => Some(false),
-                (_, StatusCode::Unmodified) => Some(true),
-                _ => None,
+                (StatusCode::Unmodified, _) => StageStatus::Unstaged,
+                (_, StatusCode::Unmodified) => StageStatus::Staged,
+                _ => StageStatus::PartiallyStaged,
            },
        }
    }
--- a/crates/git_ui/Cargo.toml
+++ b/crates/git_ui/Cargo.toml
@@ -18,13 +18,12 @@ test-support = ["multi_buffer/test-support"]

 [dependencies]
 anyhow.workspace = true
-askpass.workspace= true
+askpass.workspace = true
 buffer_diff.workspace = true
 collections.workspace = true
 component.workspace = true
 db.workspace = true
 editor.workspace = true
-feature_flags.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
 git.workspace = true
@@ -51,6 +50,7 @@ strum.workspace = true
 telemetry.workspace = true
 theme.workspace = true
 time.workspace = true
+time_format.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -1,16 +1,18 @@
 use anyhow::{anyhow, Context as _};
-use fuzzy::{StringMatch, StringMatchCandidate};
+use fuzzy::StringMatchCandidate;

 use git::repository::Branch;
 use gpui::{
    rems, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
-    Task, Window,
+    InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,
+    SharedString, Styled, Subscription, Task, Window,
 };
 use picker::{Picker, PickerDelegate};
 use project::git::Repository;
 use std::sync::Arc;
-use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing, PopoverMenuHandle};
+use time::OffsetDateTime;
+use time_format::format_local_timestamp;
+use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing};
 use util::ResultExt;
 use workspace::notifications::DetachAndPromptErr;
 use workspace::{ModalView, Workspace};
@@ -18,10 +20,30 @@ use workspace::{ModalView, Workspace};
 pub fn init(cx: &mut App) {
    cx.observe_new(|workspace: &mut Workspace, _, _| {
        workspace.register_action(open);
+        workspace.register_action(switch);
+        workspace.register_action(checkout_branch);
    })
    .detach();
 }

+pub fn checkout_branch(
+    workspace: &mut Workspace,
+    _: &zed_actions::git::CheckoutBranch,
+    window: &mut Window,
+    cx: &mut Context<Workspace>,
+) {
+    open(workspace, &zed_actions::git::Branch, window, cx);
+}
+
+pub fn switch(
+    workspace: &mut Workspace,
+    _: &zed_actions::git::Switch,
+    window: &mut Window,
+    cx: &mut Context<Workspace>,
+) {
+    open(workspace, &zed_actions::git::Branch, window, cx);
+}
+
 pub fn open(
    workspace: &mut Workspace,
    _: &zed_actions::git::Branch,
@@ -31,7 +53,7 @@ pub fn open(
    let repository = workspace.project().read(cx).active_repository(cx).clone();
    let style = BranchListStyle::Modal;
    workspace.toggle_modal(window, cx, |window, cx| {
-        BranchList::new(repository, style, 34., window, cx)
+        BranchList::new(repository, style, rems(34.), window, cx)
    })
 }

@@ -41,7 +63,7 @@ pub fn popover(
    cx: &mut App,
 ) -> Entity<BranchList> {
    cx.new(|cx| {
-        let list = BranchList::new(repository, BranchListStyle::Popover, 15., window, cx);
+        let list = BranchList::new(repository, BranchListStyle::Popover, rems(20.), window, cx);
        list.focus_handle(cx).focus(window);
        list
    })
@@ -54,8 +76,7 @@ enum BranchListStyle {
 }

 pub struct BranchList {
-    rem_width: f32,
-    pub popover_handle: PopoverMenuHandle<Self>,
+    width: Rems,
    pub picker: Entity<Picker<BranchListDelegate>>,
    _subscription: Subscription,
 }
@@ -64,20 +85,26 @@ impl BranchList {
    fn new(
        repository: Option<Entity<Repository>>,
        style: BranchListStyle,
-        rem_width: f32,
+        width: Rems,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let popover_handle = PopoverMenuHandle::default();
        let all_branches_request = repository
            .clone()
            .map(|repository| repository.read(cx).branches());

        cx.spawn_in(window, |this, mut cx| async move {
-            let all_branches = all_branches_request
+            let mut all_branches = all_branches_request
                .context("No active repository")?
                .await??;

+            all_branches.sort_by_key(|branch| {
+                branch
+                    .most_recent_commit
+                    .as_ref()
+                    .map(|commit| 0 - commit.commit_timestamp)
+            });
+
            this.update_in(&mut cx, |this, window, cx| {
                this.picker.update(cx, |picker, cx| {
                    picker.delegate.all_branches = Some(all_branches);
@@ -89,7 +116,7 @@ impl BranchList {
        })
        .detach_and_log_err(cx);

-        let delegate = BranchListDelegate::new(repository.clone(), style, 20);
+        let delegate = BranchListDelegate::new(repository.clone(), style);
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        let _subscription = cx.subscribe(&picker, |_, _, _, cx| {
@@ -98,11 +125,20 @@ impl BranchList {

        Self {
            picker,
-            rem_width,
-            popover_handle,
+            width,
            _subscription,
        }
    }
+
+    fn handle_modifiers_changed(
+        &mut self,
+        ev: &ModifiersChangedEvent,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.picker
+            .update(cx, |picker, _| picker.delegate.modifiers = ev.modifiers)
+    }
 }
 impl ModalView for BranchList {}
 impl EventEmitter<DismissEvent> for BranchList {}
@@ -116,7 +152,8 @@ impl Focusable for BranchList {
 impl Render for BranchList {
    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
-            .w(rems(self.rem_width))
+            .w(self.width)
+            .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
            .child(self.picker.clone())
            .on_mouse_down_out({
                cx.listener(move |this, _, window, cx| {
@@ -129,20 +166,10 @@ impl Render for BranchList {
 }

 #[derive(Debug, Clone)]
-enum BranchEntry {
-    Branch(StringMatch),
-    History(String),
-    NewBranch { name: String },
-}
-
-impl BranchEntry {
-    fn name(&self) -> &str {
-        match self {
-            Self::Branch(branch) => &branch.string,
-            Self::History(branch) => &branch,
-            Self::NewBranch { name } => &name,
-        }
-    }
+struct BranchEntry {
+    branch: Branch,
+    positions: Vec<usize>,
+    is_new: bool,
 }

 pub struct BranchListDelegate {
@@ -152,16 +179,11 @@ pub struct BranchListDelegate {
    style: BranchListStyle,
    selected_index: usize,
    last_query: String,
-    /// Max length of branch name before we truncate it and add a trailing `...`.
-    branch_name_trailoff_after: usize,
+    modifiers: Modifiers,
 }

 impl BranchListDelegate {
-    fn new(
-        repo: Option<Entity<Repository>>,
-        style: BranchListStyle,
-        branch_name_trailoff_after: usize,
-    ) -> Self {
+    fn new(repo: Option<Entity<Repository>>, style: BranchListStyle) -> Self {
        Self {
            matches: vec![],
            repo,
@@ -169,15 +191,30 @@ impl BranchListDelegate {
            all_branches: None,
            selected_index: 0,
            last_query: Default::default(),
-            branch_name_trailoff_after,
+            modifiers: Default::default(),
        }
    }

-    pub fn branch_count(&self) -> usize {
-        self.matches
-            .iter()
-            .filter(|item| matches!(item, BranchEntry::Branch(_)))
-            .count()
+    fn create_branch(
+        &self,
+        new_branch_name: SharedString,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        let Some(repo) = self.repo.clone() else {
+            return;
+        };
+        cx.spawn(|_, cx| async move {
+            cx.update(|cx| repo.read(cx).create_branch(&new_branch_name))?
+                .await??;
+            cx.update(|cx| repo.read(cx).change_branch(&new_branch_name))?
+                .await??;
+            Ok(())
+        })
+        .detach_and_prompt_err("Failed to create branch", window, cx, |e, _, _| {
+            Some(e.to_string())
+        });
+        cx.emit(DismissEvent);
    }
 }

@@ -211,37 +248,28 @@ impl PickerDelegate for BranchListDelegate {
        window: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Task<()> {
-        let Some(mut all_branches) = self.all_branches.clone() else {
+        let Some(all_branches) = self.all_branches.clone() else {
            return Task::ready(());
        };

+        const RECENT_BRANCHES_COUNT: usize = 10;
        cx.spawn_in(window, move |picker, mut cx| async move {
-            const RECENT_BRANCHES_COUNT: usize = 10;
-            if query.is_empty() {
-                if all_branches.len() > RECENT_BRANCHES_COUNT {
-                    // Truncate list of recent branches
-                    // Do a partial sort to show recent-ish branches first.
-                    all_branches.select_nth_unstable_by(RECENT_BRANCHES_COUNT - 1, |lhs, rhs| {
-                        rhs.priority_key().cmp(&lhs.priority_key())
-                    });
-                    all_branches.truncate(RECENT_BRANCHES_COUNT);
-                }
-                all_branches.sort_unstable_by(|lhs, rhs| {
-                    rhs.is_head.cmp(&lhs.is_head).then(lhs.name.cmp(&rhs.name))
-                });
-            }
-
-            let candidates = all_branches
-                .into_iter()
-                .enumerate()
-                .map(|(ix, command)| StringMatchCandidate::new(ix, &command.name))
-                .collect::<Vec<StringMatchCandidate>>();
-            let matches: Vec<BranchEntry> = if query.is_empty() {
-                candidates
+            let mut matches: Vec<BranchEntry> = if query.is_empty() {
+                all_branches
                    .into_iter()
-                    .map(|candidate| BranchEntry::History(candidate.string))
+                    .take(RECENT_BRANCHES_COUNT)
+                    .map(|branch| BranchEntry {
+                        branch,
+                        positions: Vec::new(),
+                        is_new: false,
+                    })
                    .collect()
            } else {
+                let candidates = all_branches
+                    .iter()
+                    .enumerate()
+                    .map(|(ix, command)| StringMatchCandidate::new(ix, &command.name.clone()))
+                    .collect::<Vec<StringMatchCandidate>>();
                fuzzy::match_strings(
                    &candidates,
                    &query,
@@ -253,20 +281,35 @@ impl PickerDelegate for BranchListDelegate {
                .await
                .iter()
                .cloned()
-                .map(BranchEntry::Branch)
+                .map(|candidate| BranchEntry {
+                    branch: all_branches[candidate.candidate_id].clone(),
+                    positions: candidate.positions,
+                    is_new: false,
+                })
                .collect()
            };
            picker
                .update(&mut cx, |picker, _| {
+                    #[allow(clippy::nonminimal_bool)]
+                    if !query.is_empty()
+                        && !matches
+                            .first()
+                            .is_some_and(|entry| entry.branch.name == query)
+                    {
+                        matches.push(BranchEntry {
+                            branch: Branch {
+                                name: query.clone().into(),
+                                is_head: false,
+                                upstream: None,
+                                most_recent_commit: None,
+                            },
+                            positions: Vec::new(),
+                            is_new: true,
+                        })
+                    }
                    let delegate = &mut picker.delegate;
                    delegate.matches = matches;
                    if delegate.matches.is_empty() {
-                        if !query.is_empty() {
-                            delegate.matches.push(BranchEntry::NewBranch {
-                                name: query.trim().replace(' ', "-"),
-                            });
-                        }
-
                        delegate.selected_index = 0;
                    } else {
                        delegate.selected_index =
@@ -278,10 +321,14 @@ impl PickerDelegate for BranchListDelegate {
        })
    }

-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(branch) = self.matches.get(self.selected_index()) else {
+    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        let Some(entry) = self.matches.get(self.selected_index()) else {
            return;
        };
+        if entry.is_new {
+            self.create_branch(entry.branch.name.clone(), window, cx);
+            return;
+        }

        let current_branch = self.repo.as_ref().map(|repo| {
            repo.update(cx, |repo, _| {
@@ -291,14 +338,14 @@ impl PickerDelegate for BranchListDelegate {

        if current_branch
            .flatten()
-            .is_some_and(|current_branch| current_branch == branch.name())
+            .is_some_and(|current_branch| current_branch == entry.branch.name)
        {
            cx.emit(DismissEvent);
            return;
        }

        cx.spawn_in(window, {
-            let branch = branch.clone();
+            let branch = entry.branch.clone();
            |picker, mut cx| async move {
                let branch_change_task = picker.update(&mut cx, |this, cx| {
                    let repo = this
@@ -311,22 +358,8 @@ impl PickerDelegate for BranchListDelegate {
                    let cx = cx.to_async();

                    anyhow::Ok(async move {
-                        match branch {
-                            BranchEntry::Branch(StringMatch {
-                                string: branch_name,
-                                ..
-                            })
-                            | BranchEntry::History(branch_name) => {
-                                cx.update(|cx| repo.read(cx).change_branch(branch_name))?
-                                    .await?
-                            }
-                            BranchEntry::NewBranch { name: branch_name } => {
-                                cx.update(|cx| repo.read(cx).create_branch(branch_name.clone()))?
-                                    .await??;
-                                cx.update(|cx| repo.read(cx).change_branch(branch_name))?
-                                    .await?
-                            }
-                        }
+                        cx.update(|cx| repo.read(cx).change_branch(&branch.name))?
+                            .await?
                    })
                })??;

@@ -346,16 +379,35 @@ impl PickerDelegate for BranchListDelegate {
        cx.emit(DismissEvent);
    }

+    fn render_header(&self, _: &mut Window, _cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
+        None
+    }
+
    fn render_match(
        &self,
        ix: usize,
        selected: bool,
        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
+        cx: &mut Context<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        let hit = &self.matches[ix];
-        let shortened_branch_name =
-            util::truncate_and_trailoff(&hit.name(), self.branch_name_trailoff_after);
+        let entry = &self.matches[ix];
+
+        let (commit_time, subject) = entry
+            .branch
+            .most_recent_commit
+            .as_ref()
+            .map(|commit| {
+                let subject = commit.subject.clone();
+                let commit_time = OffsetDateTime::from_unix_timestamp(commit.commit_timestamp)
+                    .unwrap_or_else(|_| OffsetDateTime::now_utc());
+                let formatted_time = format_local_timestamp(
+                    commit_time,
+                    OffsetDateTime::now_utc(),
+                    time_format::TimestampFormat::Relative,
+                );
+                (Some(formatted_time), Some(subject))
+            })
+            .unwrap_or_else(|| (None, None));

        Some(
            ListItem::new(SharedString::from(format!("vcs-menu-{ix}")))
@@ -366,29 +418,67 @@ impl PickerDelegate for BranchListDelegate {
                })
                .spacing(ListItemSpacing::Sparse)
                .toggle_state(selected)
-                .when(matches!(hit, BranchEntry::History(_)), |el| {
-                    el.end_slot(
-                        Icon::new(IconName::HistoryRerun)
-                            .color(Color::Muted)
-                            .size(IconSize::Small),
-                    )
-                })
-                .map(|el| match hit {
-                    BranchEntry::Branch(branch) => {
-                        let highlights: Vec<_> = branch
-                            .positions
-                            .iter()
-                            .filter(|index| index < &&self.branch_name_trailoff_after)
-                            .copied()
-                            .collect();
-
-                        el.child(HighlightedLabel::new(shortened_branch_name, highlights))
-                    }
-                    BranchEntry::History(_) => el.child(Label::new(shortened_branch_name)),
-                    BranchEntry::NewBranch { name } => {
-                        el.child(Label::new(format!("Create branch '{name}'")))
-                    }
-                }),
+                .child(
+                    v_flex()
+                        .w_full()
+                        .child(
+                            h_flex()
+                                .w_full()
+                                .flex_shrink()
+                                .overflow_x_hidden()
+                                .gap_2()
+                                .justify_between()
+                                .child(div().flex_shrink().overflow_x_hidden().child(
+                                    if entry.is_new {
+                                        Label::new(format!(
+                                            "Create branch \"{}\"…",
+                                            entry.branch.name
+                                        ))
+                                        .into_any_element()
+                                    } else {
+                                        HighlightedLabel::new(
+                                            entry.branch.name.clone(),
+                                            entry.positions.clone(),
+                                        )
+                                        .truncate()
+                                        .into_any_element()
+                                    },
+                                ))
+                                .when_some(commit_time, |el, commit_time| {
+                                    el.child(
+                                        Label::new(commit_time)
+                                            .size(LabelSize::Small)
+                                            .color(Color::Muted)
+                                            .into_element(),
+                                    )
+                                }),
+                        )
+                        .when(self.style == BranchListStyle::Modal, |el| {
+                            el.child(div().max_w_96().child({
+                                let message = if entry.is_new {
+                                    if let Some(current_branch) =
+                                        self.repo.as_ref().and_then(|repo| {
+                                            repo.read(cx).current_branch().map(|b| b.name.clone())
+                                        })
+                                    {
+                                        format!("based off {}", current_branch)
+                                    } else {
+                                        "based off the current branch".to_string()
+                                    }
+                                } else {
+                                    subject.unwrap_or("no commits found".into()).to_string()
+                                };
+                                Label::new(message)
+                                    .size(LabelSize::Small)
+                                    .truncate()
+                                    .color(Color::Muted)
+                            }))
+                        }),
+                ),
        )
    }
+
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+        None
+    }
 }
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -2,9 +2,9 @@

 use crate::branch_picker::{self, BranchList};
 use crate::git_panel::{commit_message_editor, GitPanel};
-use git::Commit;
+use git::{Commit, GenerateCommitMessage};
 use panel::{panel_button, panel_editor_style, panel_filled_button};
-use ui::{prelude::*, KeybindingHint, PopoverMenu, Tooltip};
+use ui::{prelude::*, KeybindingHint, PopoverMenu, PopoverMenuHandle, Tooltip};

 use editor::{Editor, EditorElement};
 use gpui::*;
@@ -65,11 +65,11 @@ pub fn init(cx: &mut App) {
 }

 pub struct CommitModal {
-    branch_list: Entity<BranchList>,
    git_panel: Entity<GitPanel>,
    commit_editor: Entity<Editor>,
    restore_dock: RestoreDock,
    properties: ModalContainerProperties,
+    branch_list_handle: PopoverMenuHandle<BranchList>,
 }

 impl Focusable for CommitModal {
@@ -146,7 +146,6 @@ impl CommitModal {
        cx: &mut Context<Self>,
    ) -> Self {
        let panel = git_panel.read(cx);
-        let active_repository = panel.active_repository.clone();
        let suggested_commit_message = panel.suggest_commit_message();

        let commit_editor = git_panel.update(cx, |git_panel, cx| {
@@ -177,11 +176,7 @@ impl CommitModal {
        let focus_handle = commit_editor.focus_handle(cx);

        cx.on_focus_out(&focus_handle, window, |this, _, window, cx| {
-            if !this
-                .branch_list
-                .focus_handle(cx)
-                .contains_focused(window, cx)
-            {
+            if !this.branch_list_handle.is_focused(window, cx) {
                cx.emit(DismissEvent);
            }
        })
@@ -190,11 +185,11 @@ impl CommitModal {
        let properties = ModalContainerProperties::new(window, 50);

        Self {
-            branch_list: branch_picker::popover(active_repository.clone(), window, cx),
            git_panel,
            commit_editor,
            restore_dock,
            properties,
+            branch_list_handle: PopoverMenuHandle::default(),
        }
    }

@@ -232,34 +227,29 @@ impl CommitModal {
    }

    pub fn render_footer(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let git_panel = self.git_panel.clone();
-
-        let (branch, can_commit, tooltip, commit_label, co_authors, generate_commit_message) =
+        let (can_commit, tooltip, commit_label, co_authors, generate_commit_message, active_repo) =
            self.git_panel.update(cx, |git_panel, cx| {
-                let branch = git_panel
-                    .active_repository
-                    .as_ref()
-                    .and_then(|repo| {
-                        repo.read(cx)
-                            .repository_entry
-                            .branch()
-                            .map(|b| b.name.clone())
-                    })
-                    .unwrap_or_else(|| "<no branch>".into());
                let (can_commit, tooltip) = git_panel.configure_commit_button(cx);
                let title = git_panel.commit_button_title();
                let co_authors = git_panel.render_co_authors(cx);
                let generate_commit_message = git_panel.render_generate_commit_message_button(cx);
+                let active_repo = git_panel.active_repository.clone();
                (
-                    branch,
                    can_commit,
                    tooltip,
                    title,
                    co_authors,
                    generate_commit_message,
+                    active_repo,
                )
            });

+        let branch = active_repo
+            .as_ref()
+            .and_then(|repo| repo.read(cx).repository_entry.branch())
+            .map(|b| b.name.clone())
+            .unwrap_or_else(|| "<no branch>".into());
+
        let branch_picker_button = panel_button(branch)
            .icon(IconName::GitBranch)
            .icon_size(IconSize::Small)
@@ -276,10 +266,8 @@ impl CommitModal {
            .style(ButtonStyle::Transparent);

        let branch_picker = PopoverMenu::new("popover-button")
-            .menu({
-                let branch_list = self.branch_list.clone();
-                move |_window, _cx| Some(branch_list.clone())
-            })
+            .menu(move |window, cx| Some(branch_picker::popover(active_repo.clone(), window, cx)))
+            .with_handle(self.branch_list_handle.clone())
            .trigger_with_tooltip(
                branch_picker_button,
                Tooltip::for_action_title("Switch Branch", &zed_actions::git::Branch),
@@ -289,6 +277,7 @@ impl CommitModal {
                x: px(0.0),
                y: px(-2.0),
            });
+        let focus_handle = self.focus_handle(cx);

        let close_kb_hint =
            if let Some(close_kb) = ui::KeyBinding::for_action(&menu::Cancel, window, cx) {
@@ -300,12 +289,9 @@ impl CommitModal {
                None
            };

-        let panel_editor_focus_handle =
-            git_panel.update(cx, |git_panel, cx| git_panel.editor_focus_handle(cx));
-
        let commit_button = panel_filled_button(commit_label)
            .tooltip({
-                let panel_editor_focus_handle = panel_editor_focus_handle.clone();
+                let panel_editor_focus_handle = focus_handle.clone();
                move |window, cx| {
                    Tooltip::for_action_in(tooltip, &Commit, &panel_editor_focus_handle, window, cx)
                }
@@ -330,7 +316,14 @@ impl CommitModal {
            .child(
                h_flex()
                    .gap_1()
-                    .child(branch_picker)
+                    .flex_shrink()
+                    .overflow_x_hidden()
+                    .child(
+                        h_flex()
+                            .flex_shrink()
+                            .overflow_x_hidden()
+                            .child(branch_picker),
+                    )
                    .children(generate_commit_message)
                    .children(co_authors),
            )
@@ -357,6 +350,14 @@ impl CommitModal {
            .update(cx, |git_panel, cx| git_panel.commit_changes(window, cx));
        cx.emit(DismissEvent);
    }
+
+    fn toggle_branch_selector(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.branch_list_handle.is_focused(window, cx) {
+            self.focus_handle(cx).focus(window)
+        } else {
+            self.branch_list_handle.toggle(window, cx);
+        }
+    }
 }

 impl Render for CommitModal {
@@ -372,11 +373,24 @@ impl Render for CommitModal {
            .key_context("GitCommit")
            .on_action(cx.listener(Self::dismiss))
            .on_action(cx.listener(Self::commit))
+            .on_action(cx.listener(|this, _: &GenerateCommitMessage, _, cx| {
+                this.git_panel.update(cx, |panel, cx| {
+                    panel.generate_commit_message(cx);
+                })
+            }))
            .on_action(
                cx.listener(|this, _: &zed_actions::git::Branch, window, cx| {
-                    this.branch_list.update(cx, |branch_list, cx| {
-                        branch_list.popover_handle.toggle(window, cx);
-                    })
+                    this.toggle_branch_selector(window, cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &zed_actions::git::CheckoutBranch, window, cx| {
+                    this.toggle_branch_selector(window, cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &zed_actions::git::Switch, window, cx| {
+                    this.toggle_branch_selector(window, cx);
                }),
            )
            .elevation_3(cx)
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -1,9 +1,13 @@
 use ::settings::Settings;
-use git::status::FileStatus;
+use git::{
+    repository::{Branch, Upstream, UpstreamTracking, UpstreamTrackingStatus},
+    status::{FileStatus, StatusCode, UnmergedStatus, UnmergedStatusCode},
+};
 use git_panel_settings::GitPanelSettings;
-use gpui::App;
+use gpui::{App, Entity, FocusHandle};
+use project::Project;
 use project_diff::ProjectDiff;
-use ui::{ActiveTheme, Color, Icon, IconName, IntoElement};
+use ui::prelude::*;
 use workspace::Workspace;

 mod askpass_modal;
@@ -25,67 +29,493 @@ pub fn init(cx: &mut App) {

    cx.observe_new(|workspace: &mut Workspace, _, cx| {
        let project = workspace.project().read(cx);
-        if project.is_via_collab() {
+        if project.is_read_only(cx) {
            return;
        }
-        workspace.register_action(|workspace, _: &git::Fetch, window, cx| {
+        if !project.is_via_collab() {
+            workspace.register_action(|workspace, _: &git::Fetch, window, cx| {
+                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
+                    return;
+                };
+                panel.update(cx, |panel, cx| {
+                    panel.fetch(window, cx);
+                });
+            });
+            workspace.register_action(|workspace, _: &git::Push, window, cx| {
+                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
+                    return;
+                };
+                panel.update(cx, |panel, cx| {
+                    panel.push(false, window, cx);
+                });
+            });
+            workspace.register_action(|workspace, _: &git::ForcePush, window, cx| {
+                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
+                    return;
+                };
+                panel.update(cx, |panel, cx| {
+                    panel.push(true, window, cx);
+                });
+            });
+            workspace.register_action(|workspace, _: &git::Pull, window, cx| {
+                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
+                    return;
+                };
+                panel.update(cx, |panel, cx| {
+                    panel.pull(window, cx);
+                });
+            });
+        }
+        workspace.register_action(|workspace, action: &git::StageAll, window, cx| {
            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
                return;
            };
            panel.update(cx, |panel, cx| {
-                panel.fetch(window, cx);
+                panel.stage_all(action, window, cx);
            });
        });
-        workspace.register_action(|workspace, _: &git::Push, window, cx| {
+        workspace.register_action(|workspace, action: &git::UnstageAll, window, cx| {
            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
                return;
            };
            panel.update(cx, |panel, cx| {
-                panel.push(false, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, _: &git::ForcePush, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.push(true, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, _: &git::Pull, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.pull(window, cx);
+                panel.unstage_all(action, window, cx);
            });
        });
    })
    .detach();
 }

-// TODO: Add updated status colors to theme
-pub fn git_status_icon(status: FileStatus, cx: &App) -> impl IntoElement {
-    let (icon_name, color) = if status.is_conflicted() {
-        (
-            IconName::Warning,
-            cx.theme().colors().version_control_conflict,
-        )
-    } else if status.is_deleted() {
-        (
-            IconName::SquareMinus,
-            cx.theme().colors().version_control_deleted,
-        )
-    } else if status.is_modified() {
-        (
-            IconName::SquareDot,
-            cx.theme().colors().version_control_modified,
-        )
-    } else {
-        (
-            IconName::SquarePlus,
-            cx.theme().colors().version_control_added,
-        )
-    };
-    Icon::new(icon_name).color(Color::Custom(color))
+pub fn git_status_icon(status: FileStatus) -> impl IntoElement {
+    GitStatusIcon::new(status)
+}
+
+fn can_push_and_pull(project: &Entity<Project>, cx: &App) -> bool {
+    !project.read(cx).is_via_collab()
+}
+
+fn render_remote_button(
+    id: impl Into<SharedString>,
+    branch: &Branch,
+    keybinding_target: Option<FocusHandle>,
+    show_fetch_button: bool,
+) -> Option<impl IntoElement> {
+    let id = id.into();
+    let upstream = branch.upstream.as_ref();
+    match upstream {
+        Some(Upstream {
+            tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus { ahead, behind }),
+            ..
+        }) => match (*ahead, *behind) {
+            (0, 0) if show_fetch_button => {
+                Some(remote_button::render_fetch_button(keybinding_target, id))
+            }
+            (0, 0) => None,
+            (ahead, 0) => Some(remote_button::render_push_button(
+                keybinding_target.clone(),
+                id,
+                ahead,
+            )),
+            (ahead, behind) => Some(remote_button::render_pull_button(
+                keybinding_target.clone(),
+                id,
+                ahead,
+                behind,
+            )),
+        },
+        Some(Upstream {
+            tracking: UpstreamTracking::Gone,
+            ..
+        }) => Some(remote_button::render_republish_button(
+            keybinding_target,
+            id,
+        )),
+        None => Some(remote_button::render_publish_button(keybinding_target, id)),
+    }
+}
+
+mod remote_button {
+    use gpui::{hsla, point, Action, AnyView, BoxShadow, ClickEvent, Corner, FocusHandle};
+    use ui::{
+        div, h_flex, px, rems, ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, Clickable,
+        ContextMenu, ElementId, ElevationIndex, FluentBuilder, Icon, IconName, IconSize,
+        IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle, ParentElement, PopoverMenu,
+        RenderOnce, SharedString, Styled, Tooltip, Window,
+    };
+
+    pub fn render_fetch_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Fetch",
+            0,
+            0,
+            Some(IconName::ArrowCircle),
+            keybinding_target.clone(),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Fetch), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Fetch updates from remote",
+                    &git::Fetch,
+                    "git fetch",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_push_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+        ahead: u32,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Push",
+            ahead as usize,
+            0,
+            None,
+            keybinding_target.clone(),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Push), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Push committed changes to remote",
+                    &git::Push,
+                    "git push",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_pull_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+        ahead: u32,
+        behind: u32,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Pull",
+            ahead as usize,
+            behind as usize,
+            None,
+            keybinding_target.clone(),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Pull), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Pull",
+                    &git::Pull,
+                    "git pull",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_publish_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Publish",
+            0,
+            0,
+            Some(IconName::ArrowUpFromLine),
+            keybinding_target.clone(),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Push), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Publish branch to remote",
+                    &git::Push,
+                    "git push --set-upstream",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_republish_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Republish",
+            0,
+            0,
+            Some(IconName::ArrowUpFromLine),
+            keybinding_target.clone(),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Push), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Re-publish branch to remote",
+                    &git::Push,
+                    "git push --set-upstream",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    fn git_action_tooltip(
+        label: impl Into<SharedString>,
+        action: &dyn Action,
+        command: impl Into<SharedString>,
+        focus_handle: Option<FocusHandle>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
+        let label = label.into();
+        let command = command.into();
+
+        if let Some(handle) = focus_handle {
+            Tooltip::with_meta_in(
+                label.clone(),
+                Some(action),
+                command.clone(),
+                &handle,
+                window,
+                cx,
+            )
+        } else {
+            Tooltip::with_meta(label.clone(), Some(action), command.clone(), window, cx)
+        }
+    }
+
+    fn render_git_action_menu(
+        id: impl Into<ElementId>,
+        keybinding_target: Option<FocusHandle>,
+    ) -> impl IntoElement {
+        PopoverMenu::new(id.into())
+            .trigger(
+                ui::ButtonLike::new_rounded_right("split-button-right")
+                    .layer(ui::ElevationIndex::ModalSurface)
+                    .size(ui::ButtonSize::None)
+                    .child(
+                        div()
+                            .px_1()
+                            .child(Icon::new(IconName::ChevronDownSmall).size(IconSize::XSmall)),
+                    ),
+            )
+            .menu(move |window, cx| {
+                Some(ContextMenu::build(window, cx, |context_menu, _, _| {
+                    context_menu
+                        .when_some(keybinding_target.clone(), |el, keybinding_target| {
+                            el.context(keybinding_target.clone())
+                        })
+                        .action("Fetch", git::Fetch.boxed_clone())
+                        .action("Pull", git::Pull.boxed_clone())
+                        .separator()
+                        .action("Push", git::Push.boxed_clone())
+                        .action("Force Push", git::ForcePush.boxed_clone())
+                }))
+            })
+            .anchor(Corner::TopRight)
+    }
+
+    #[derive(IntoElement)]
+    pub struct SplitButton {
+        pub left: ButtonLike,
+        pub right: AnyElement,
+    }
+
+    impl SplitButton {
+        #[allow(clippy::too_many_arguments)]
+        fn new(
+            id: impl Into<SharedString>,
+            left_label: impl Into<SharedString>,
+            ahead_count: usize,
+            behind_count: usize,
+            left_icon: Option<IconName>,
+            keybinding_target: Option<FocusHandle>,
+            left_on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+            tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
+        ) -> Self {
+            let id = id.into();
+
+            fn count(count: usize) -> impl IntoElement {
+                h_flex()
+                    .ml_neg_px()
+                    .h(rems(0.875))
+                    .items_center()
+                    .overflow_hidden()
+                    .px_0p5()
+                    .child(
+                        Label::new(count.to_string())
+                            .size(LabelSize::XSmall)
+                            .line_height_style(LineHeightStyle::UiLabel),
+                    )
+            }
+
+            let should_render_counts = left_icon.is_none() && (ahead_count > 0 || behind_count > 0);
+
+            let left = ui::ButtonLike::new_rounded_left(ElementId::Name(
+                format!("split-button-left-{}", id).into(),
+            ))
+            .layer(ui::ElevationIndex::ModalSurface)
+            .size(ui::ButtonSize::Compact)
+            .when(should_render_counts, |this| {
+                this.child(
+                    h_flex()
+                        .ml_neg_0p5()
+                        .mr_1()
+                        .when(behind_count > 0, |this| {
+                            this.child(Icon::new(IconName::ArrowDown).size(IconSize::XSmall))
+                                .child(count(behind_count))
+                        })
+                        .when(ahead_count > 0, |this| {
+                            this.child(Icon::new(IconName::ArrowUp).size(IconSize::XSmall))
+                                .child(count(ahead_count))
+                        }),
+                )
+            })
+            .when_some(left_icon, |this, left_icon| {
+                this.child(
+                    h_flex()
+                        .ml_neg_0p5()
+                        .mr_1()
+                        .child(Icon::new(left_icon).size(IconSize::XSmall)),
+                )
+            })
+            .child(
+                div()
+                    .child(Label::new(left_label).size(LabelSize::Small))
+                    .mr_0p5(),
+            )
+            .on_click(left_on_click)
+            .tooltip(tooltip);
+
+            let right = render_git_action_menu(
+                ElementId::Name(format!("split-button-right-{}", id).into()),
+                keybinding_target,
+            )
+            .into_any_element();
+
+            Self { left, right }
+        }
+    }
+
+    impl RenderOnce for SplitButton {
+        fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+            h_flex()
+                .rounded_sm()
+                .border_1()
+                .border_color(cx.theme().colors().text_muted.alpha(0.12))
+                .child(div().flex_grow().child(self.left))
+                .child(
+                    div()
+                        .h_full()
+                        .w_px()
+                        .bg(cx.theme().colors().text_muted.alpha(0.16)),
+                )
+                .child(self.right)
+                .bg(ElevationIndex::Surface.on_elevation_bg(cx))
+                .shadow(smallvec::smallvec![BoxShadow {
+                    color: hsla(0.0, 0.0, 0.0, 0.16),
+                    offset: point(px(0.), px(1.)),
+                    blur_radius: px(0.),
+                    spread_radius: px(0.),
+                }])
+        }
+    }
+}
+
+#[derive(IntoElement, IntoComponent)]
+#[component(scope = "Version Control")]
+pub struct GitStatusIcon {
+    status: FileStatus,
+}
+
+impl GitStatusIcon {
+    pub fn new(status: FileStatus) -> Self {
+        Self { status }
+    }
+}
+
+impl RenderOnce for GitStatusIcon {
+    fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
+        let status = self.status;
+
+        let (icon_name, color) = if status.is_conflicted() {
+            (
+                IconName::Warning,
+                cx.theme().colors().version_control_conflict,
+            )
+        } else if status.is_deleted() {
+            (
+                IconName::SquareMinus,
+                cx.theme().colors().version_control_deleted,
+            )
+        } else if status.is_modified() {
+            (
+                IconName::SquareDot,
+                cx.theme().colors().version_control_modified,
+            )
+        } else {
+            (
+                IconName::SquarePlus,
+                cx.theme().colors().version_control_added,
+            )
+        };
+
+        Icon::new(icon_name).color(Color::Custom(color))
+    }
+}
+
+// View this component preview using `workspace: open component-preview`
+impl ComponentPreview for GitStatusIcon {
+    fn preview(_window: &mut Window, _cx: &mut App) -> AnyElement {
+        fn tracked_file_status(code: StatusCode) -> FileStatus {
+            FileStatus::Tracked(git::status::TrackedStatus {
+                index_status: code,
+                worktree_status: code,
+            })
+        }
+
+        let modified = tracked_file_status(StatusCode::Modified);
+        let added = tracked_file_status(StatusCode::Added);
+        let deleted = tracked_file_status(StatusCode::Deleted);
+        let conflict = UnmergedStatus {
+            first_head: UnmergedStatusCode::Updated,
+            second_head: UnmergedStatusCode::Updated,
+        }
+        .into();
+
+        v_flex()
+            .gap_6()
+            .children(vec![example_group(vec![
+                single_example("Modified", GitStatusIcon::new(modified).into_any_element()),
+                single_example("Added", GitStatusIcon::new(added).into_any_element()),
+                single_example("Deleted", GitStatusIcon::new(deleted).into_any_element()),
+                single_example(
+                    "Conflicted",
+                    GitStatusIcon::new(conflict).into_any_element(),
+                ),
+            ])])
+            .into_any_element()
+    }
 }
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -7,10 +7,10 @@ use editor::{
    scroll::Autoscroll,
    Editor, EditorEvent,
 };
-use feature_flags::FeatureFlagViewExt;
 use futures::StreamExt;
 use git::{
-    status::FileStatus, Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll, UnstageAndNext,
+    repository::Branch, status::FileStatus, Commit, StageAll, StageAndNext, ToggleStaged,
+    UnstageAll, UnstageAndNext,
 };
 use gpui::{
    actions, Action, AnyElement, AnyView, App, AppContext as _, AsyncWindowContext, Entity,
@@ -24,27 +24,27 @@ use project::{
 };
 use std::any::{Any, TypeId};
 use theme::ActiveTheme;
-use ui::{prelude::*, vertical_divider, Tooltip};
+use ui::{prelude::*, vertical_divider, KeyBinding, Tooltip};
 use util::ResultExt as _;
 use workspace::{
    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
    searchable::SearchableItemHandle,
-    ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
-    Workspace,
+    CloseActiveItem, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation,
+    ToolbarItemView, Workspace,
 };

-actions!(git, [Diff]);
+actions!(git, [Diff, Add]);

 pub struct ProjectDiff {
+    project: Entity<Project>,
    multibuffer: Entity<MultiBuffer>,
    editor: Entity<Editor>,
-    project: Entity<Project>,
    git_store: Entity<GitStore>,
    workspace: WeakEntity<Workspace>,
    focus_handle: FocusHandle,
    update_needed: postage::watch::Sender<()>,
    pending_scroll: Option<PathKey>,
-
+    current_branch: Option<Branch>,
    _task: Task<Result<()>>,
    _subscription: Subscription,
 }
@@ -63,13 +63,13 @@ const NEW_NAMESPACE: &'static str = "2";

 impl ProjectDiff {
    pub(crate) fn register(
-        _: &mut Workspace,
-        window: Option<&mut Window>,
+        workspace: &mut Workspace,
+        _window: Option<&mut Window>,
        cx: &mut Context<Workspace>,
    ) {
-        let Some(window) = window else { return };
-        cx.when_flag_enabled::<feature_flags::GitUiFeatureFlag>(window, |workspace, _, _cx| {
-            workspace.register_action(Self::deploy);
+        workspace.register_action(Self::deploy);
+        workspace.register_action(|workspace, _: &Add, window, cx| {
+            Self::deploy(workspace, &Diff, window, cx);
        });

        workspace::register_serializable_item::<ProjectDiff>(cx);
@@ -121,6 +121,12 @@ impl ProjectDiff {
        }
    }

+    pub fn autoscroll(&self, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.request_autoscroll(Autoscroll::fit(), cx);
+        })
+    }
+
    fn new(
        project: Entity<Project>,
        workspace: Entity<Workspace>,
@@ -179,6 +185,7 @@ impl ProjectDiff {
            multibuffer,
            pending_scroll: None,
            update_needed: send,
+            current_branch: None,
            _task: worker,
            _subscription: git_store_subscription,
        }
@@ -444,6 +451,20 @@ impl ProjectDiff {
        mut cx: AsyncWindowContext,
    ) -> Result<()> {
        while let Some(_) = recv.next().await {
+            this.update(&mut cx, |this, cx| {
+                let new_branch =
+                    this.git_store
+                        .read(cx)
+                        .active_repository()
+                        .and_then(|active_repository| {
+                            active_repository.read(cx).current_branch().cloned()
+                        });
+                if new_branch != this.current_branch {
+                    this.current_branch = new_branch;
+                    cx.notify();
+                }
+            })?;
+
            let buffers_to_load = this.update(&mut cx, |this, cx| this.load_buffers(cx))?;
            for buffer_to_load in buffers_to_load {
                if let Some(buffer) = buffer_to_load.await.log_err() {
@@ -453,7 +474,10 @@ impl ProjectDiff {
                    })?;
                }
            }
-            this.update(&mut cx, |this, _| this.pending_scroll.take())?;
+            this.update(&mut cx, |this, cx| {
+                this.pending_scroll.take();
+                cx.notify();
+            })?;
        }

        Ok(())
@@ -642,9 +666,11 @@ impl Item for ProjectDiff {
 }

 impl Render for ProjectDiff {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let is_empty = self.multibuffer.read(cx).is_empty();

+        let can_push_and_pull = crate::can_push_and_pull(&self.project, cx);
+
        div()
            .track_focus(&self.focus_handle)
            .key_context(if is_empty { "EmptyPane" } else { "GitDiff" })
@@ -654,7 +680,61 @@ impl Render for ProjectDiff {
            .justify_center()
            .size_full()
            .when(is_empty, |el| {
-                el.child(Label::new("No uncommitted changes"))
+                el.child(
+                    v_flex()
+                        .gap_1()
+                        .child(
+                            h_flex()
+                                .justify_around()
+                                .child(Label::new("No uncommitted changes")),
+                        )
+                        .when(can_push_and_pull, |this_div| {
+                            let keybinding_focus_handle = self.focus_handle(cx);
+
+                            this_div.when_some(self.current_branch.as_ref(), |this_div, branch| {
+                                let remote_button = crate::render_remote_button(
+                                    "project-diff-remote-button",
+                                    branch,
+                                    Some(keybinding_focus_handle.clone()),
+                                    false,
+                                );
+
+                                match remote_button {
+                                    Some(button) => {
+                                        this_div.child(h_flex().justify_around().child(button))
+                                    }
+                                    None => this_div.child(
+                                        h_flex()
+                                            .justify_around()
+                                            .child(Label::new("Remote up to date")),
+                                    ),
+                                }
+                            })
+                        })
+                        .map(|this| {
+                            let keybinding_focus_handle = self.focus_handle(cx).clone();
+
+                            this.child(
+                                h_flex().justify_around().mt_1().child(
+                                    Button::new("project-diff-close-button", "Close")
+                                        // .style(ButtonStyle::Transparent)
+                                        .key_binding(KeyBinding::for_action_in(
+                                            &CloseActiveItem::default(),
+                                            &keybinding_focus_handle,
+                                            window,
+                                            cx,
+                                        ))
+                                        .on_click(move |_, window, cx| {
+                                            window.focus(&keybinding_focus_handle);
+                                            window.dispatch_action(
+                                                Box::new(CloseActiveItem::default()),
+                                                cx,
+                                            );
+                                        }),
+                                ),
+                            )
+                        }),
+                )
            })
            .when(!is_empty, |el| el.child(self.editor.clone()))
    }
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -152,7 +152,10 @@ impl GoToLine {
        cx: &mut Context<Self>,
    ) {
        match event {
-            editor::EditorEvent::Blurred => cx.emit(DismissEvent),
+            editor::EditorEvent::Blurred => {
+                self.prev_scroll_position.take();
+                cx.emit(DismissEvent)
+            }
            editor::EditorEvent::BufferEdited { .. } => self.highlight_current_line(cx),
            _ => {}
        }
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -207,7 +207,7 @@ blade-macros.workspace = true
 flume = "0.11"
 rand.workspace = true
 windows.workspace = true
-windows-core = "0.58"
+windows-core = "0.60"

 [dev-dependencies]
 backtrace = "0.3"
--- a/crates/gpui/src/app/entity_map.rs
+++ b/crates/gpui/src/app/entity_map.rs
@@ -178,6 +178,7 @@ impl EntityMap {
    }
 }

+#[track_caller]
 fn double_lease_panic<T>(operation: &str) -> ! {
    panic!(
        "cannot {operation} {} while it is already being updated",
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
@@ -634,7 +634,7 @@ impl Display for ColorSpace {
 }

 /// A background color, which can be either a solid color or a linear gradient.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq)]
 #[repr(C)]
 pub struct Background {
    pub(crate) tag: BackgroundTag,
@@ -646,6 +646,28 @@ pub struct Background {
    pad: u32,
 }

+impl std::fmt::Debug for Background {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.tag {
+            BackgroundTag::Solid => write!(f, "Solid({:?})", self.solid),
+            BackgroundTag::LinearGradient => {
+                write!(
+                    f,
+                    "LinearGradient({}, {:?}, {:?})",
+                    self.gradient_angle_or_pattern_height, self.colors[0], self.colors[1]
+                )
+            }
+            BackgroundTag::PatternSlash => {
+                write!(
+                    f,
+                    "PatternSlash({:?}, {})",
+                    self.solid, self.gradient_angle_or_pattern_height
+                )
+            }
+        }
+    }
+}
+
 impl Eq for Background {}
 impl Default for Background {
    fn default() -> Self {
@@ -661,11 +683,11 @@ impl Default for Background {
 }

 /// Creates a hash pattern background
-pub fn pattern_slash(color: Hsla, thickness: f32) -> Background {
+pub fn pattern_slash(color: Hsla, height: f32) -> Background {
    Background {
        tag: BackgroundTag::PatternSlash,
        solid: color,
-        gradient_angle_or_pattern_height: thickness,
+        gradient_angle_or_pattern_height: height,
        ..Default::default()
    }
 }
--- a/crates/gpui/src/platform/keystroke.rs
+++ b/crates/gpui/src/platform/keystroke.rs
@@ -76,8 +76,9 @@ impl Keystroke {
    }

    /// key syntax is:
-    /// [ctrl-][alt-][shift-][cmd-][fn-]key[->key_char]
+    /// [secondary-][ctrl-][alt-][shift-][cmd-][fn-]key[->key_char]
    /// key_char syntax is only used for generating test events,
+    /// secondary means "cmd" on macOS and "ctrl" on other platforms
    /// when matching a key with an key_char set will be matched without it.
    pub fn parse(source: &str) -> std::result::Result<Self, InvalidKeystrokeError> {
        let mut control = false;
@@ -95,6 +96,13 @@ impl Keystroke {
                "alt" => alt = true,
                "shift" => shift = true,
                "fn" => function = true,
+                "secondary" => {
+                    if cfg!(target_os = "macos") {
+                        platform = true
+                    } else {
+                        control = true
+                    };
+                }
                "cmd" | "super" | "win" => platform = true,
                _ => {
                    if let Some(next) = components.peek() {
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -115,7 +115,6 @@ pub struct WaylandWindowStatePtr {
 }

 impl WaylandWindowState {
-    #[allow(clippy::too_many_arguments)]
    pub(crate) fn new(
        handle: AnyWindowHandle,
        surface: wl_surface::WlSurface,
--- a/crates/gpui/src/platform/linux/x11/window.rs
+++ b/crates/gpui/src/platform/linux/x11/window.rs
@@ -353,7 +353,6 @@ where
 }

 impl X11WindowState {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        handle: AnyWindowHandle,
        client: X11ClientStatePtr,
@@ -712,7 +711,6 @@ enum WmHintPropertyState {
 }

 impl X11Window {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        handle: AnyWindowHandle,
        client: X11ClientStatePtr,
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -347,20 +347,7 @@ impl MacPlatform {
                                msg_send![item, setAllowsAutomaticKeyEquivalentLocalization: NO];
                        }
                        item.setKeyEquivalentModifierMask_(mask);
-                    }
-                    // For multi-keystroke bindings, render the keystroke as part of the title.
-                    else {
-                        use std::fmt::Write;
-
-                        let mut name = format!("{name} [");
-                        for (i, keystroke) in keystrokes.iter().enumerate() {
-                            if i > 0 {
-                                name.push(' ');
-                            }
-                            write!(&mut name, "{}", keystroke).unwrap();
-                        }
-                        name.push(']');
-
+                    } else {
                        item = NSMenuItem::alloc(nil)
                            .initWithTitle_action_keyEquivalent_(
                                ns_string(&name),
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -268,6 +268,10 @@ unsafe fn build_window_class(name: &'static str, superclass: &Class) -> *const C
        sel!(windowWillEnterFullScreen:),
        window_will_enter_fullscreen as extern "C" fn(&Object, Sel, id),
    );
+    decl.add_method(
+        sel!(windowWillExitFullScreen:),
+        window_will_exit_fullscreen as extern "C" fn(&Object, Sel, id),
+    );
    decl.add_method(
        sel!(windowDidMove:),
        window_did_move as extern "C" fn(&Object, Sel, id),
@@ -334,6 +338,7 @@ struct MacWindowState {
    last_key_equivalent: Option<KeyDownEvent>,
    synthetic_drag_counter: usize,
    traffic_light_position: Option<Point<Pixels>>,
+    transparent_titlebar: bool,
    previous_modifiers_changed_event: Option<PlatformInput>,
    keystroke_for_do_command: Option<Keystroke>,
    do_command_handled: Option<bool>,
@@ -613,6 +618,9 @@ impl MacWindow {
                traffic_light_position: titlebar
                    .as_ref()
                    .and_then(|titlebar| titlebar.traffic_light_position),
+                transparent_titlebar: titlebar
+                    .as_ref()
+                    .map_or(true, |titlebar| titlebar.appears_transparent),
                previous_modifiers_changed_event: None,
                keystroke_for_do_command: None,
                do_command_handled: None,
@@ -1490,6 +1498,19 @@ extern "C" fn window_will_enter_fullscreen(this: &Object, _: Sel, _: id) {
    let window_state = unsafe { get_window_state(this) };
    let mut lock = window_state.as_ref().lock();
    lock.fullscreen_restore_bounds = lock.bounds();
+    unsafe {
+        lock.native_window.setTitlebarAppearsTransparent_(NO);
+    }
+}
+
+extern "C" fn window_will_exit_fullscreen(this: &Object, _: Sel, _: id) {
+    let window_state = unsafe { get_window_state(this) };
+    let mut lock = window_state.as_ref().lock();
+    if lock.transparent_titlebar {
+        unsafe {
+            lock.native_window.setTitlebarAppearsTransparent_(YES);
+        }
+    }
 }

 extern "C" fn window_did_move(this: &Object, _: Sel, _: id) {
--- a/crates/gpui/src/platform/windows/clipboard.rs
+++ b/crates/gpui/src/platform/windows/clipboard.rs
@@ -170,7 +170,7 @@ fn set_data_to_clipboard<T>(data: &[T], format: u32) -> Result<()> {
        let handle = GlobalLock(global);
        std::ptr::copy_nonoverlapping(data.as_ptr(), handle as _, data.len());
        let _ = GlobalUnlock(global);
-        SetClipboardData(format, HANDLE(global.0))?;
+        SetClipboardData(format, Some(HANDLE(global.0)))?;
    }
    Ok(())
 }
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -1049,7 +1049,7 @@ impl IDWriteTextRenderer_Impl for TextRenderer_Impl {
        _measuringmode: DWRITE_MEASURING_MODE,
        glyphrun: *const DWRITE_GLYPH_RUN,
        glyphrundescription: *const DWRITE_GLYPH_RUN_DESCRIPTION,
-        _clientdrawingeffect: Option<&windows::core::IUnknown>,
+        _clientdrawingeffect: windows::core::Ref<windows::core::IUnknown>,
    ) -> windows::core::Result<()> {
        unsafe {
            let glyphrun = &*glyphrun;
@@ -1113,7 +1113,7 @@ impl IDWriteTextRenderer_Impl for TextRenderer_Impl {
        _baselineoriginx: f32,
        _baselineoriginy: f32,
        _underline: *const DWRITE_UNDERLINE,
-        _clientdrawingeffect: Option<&windows::core::IUnknown>,
+        _clientdrawingeffect: windows::core::Ref<windows::core::IUnknown>,
    ) -> windows::core::Result<()> {
        Err(windows::core::Error::new(
            E_NOTIMPL,
@@ -1127,7 +1127,7 @@ impl IDWriteTextRenderer_Impl for TextRenderer_Impl {
        _baselineoriginx: f32,
        _baselineoriginy: f32,
        _strikethrough: *const DWRITE_STRIKETHROUGH,
-        _clientdrawingeffect: Option<&windows::core::IUnknown>,
+        _clientdrawingeffect: windows::core::Ref<windows::core::IUnknown>,
    ) -> windows::core::Result<()> {
        Err(windows::core::Error::new(
            E_NOTIMPL,
@@ -1140,10 +1140,10 @@ impl IDWriteTextRenderer_Impl for TextRenderer_Impl {
        _clientdrawingcontext: *const ::core::ffi::c_void,
        _originx: f32,
        _originy: f32,
-        _inlineobject: Option<&IDWriteInlineObject>,
+        _inlineobject: windows::core::Ref<IDWriteInlineObject>,
        _issideways: BOOL,
        _isrighttoleft: BOOL,
-        _clientdrawingeffect: Option<&windows::core::IUnknown>,
+        _clientdrawingeffect: windows::core::Ref<windows::core::IUnknown>,
    ) -> windows::core::Result<()> {
        Err(windows::core::Error::new(
            E_NOTIMPL,
--- a/Show More
+++ b/Show More