Clean up some comments

Fix API key bug
Remove builtin Anthropic provider
2025-12-05 13:00:19 -05:00 · 2025-12-05 12:59:19 -05:00 · 2025-12-05 12:11:51 -05:00 · 2025-12-05 11:48:11 -05:00 · 2025-12-05 11:32:58 -05:00 · 2025-12-05 11:19:10 -05:00
593 changed files with 33085 additions and 19702 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,3 @@ xcuserdata/
 # Don't commit any secrets to the repo.
 .env
 .env.secret.toml
-
-# `nix build` output
-/result 
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,9 +54,9 @@ members = [
    "crates/diagnostics",
    "crates/docs_preprocessor",
    "crates/edit_prediction",
-    "crates/edit_prediction_types",
-    "crates/edit_prediction_ui",
+    "crates/edit_prediction_button",
    "crates/edit_prediction_context",
+    "crates/zeta2_tools",
    "crates/editor",
    "crates/eval",
    "crates/eval_utils",
@@ -201,11 +201,10 @@ members = [
    "crates/zed",
    "crates/zed_actions",
    "crates/zed_env_vars",
-    "crates/edit_prediction_cli",
+    "crates/zeta",
+    "crates/zeta_cli",
    "crates/zlog",
    "crates/zlog_settings",
-    "crates/ztracing",
-    "crates/ztracing_macro",

    #
    # Extensions
@@ -244,6 +243,7 @@ activity_indicator = { path = "crates/activity_indicator" }
 agent_ui = { path = "crates/agent_ui" }
 agent_settings = { path = "crates/agent_settings" }
 agent_servers = { path = "crates/agent_servers" }
+ai = { path = "crates/ai" }
 ai_onboarding = { path = "crates/ai_onboarding" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
@@ -253,6 +253,7 @@ assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
+auto_update_helper = { path = "crates/auto_update_helper" }
 auto_update_ui = { path = "crates/auto_update_ui" }
 aws_http_client = { path = "crates/aws_http_client" }
 bedrock = { path = "crates/bedrock" }
@@ -267,6 +268,7 @@ cloud_api_client = { path = "crates/cloud_api_client" }
 cloud_api_types = { path = "crates/cloud_api_types" }
 cloud_llm_client = { path = "crates/cloud_llm_client" }
 cloud_zeta2_prompt = { path = "crates/cloud_zeta2_prompt" }
+collab = { path = "crates/collab" }
 collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections", version = "0.1.0" }
 command_palette = { path = "crates/command_palette" }
@@ -311,9 +313,10 @@ http_client = { path = "crates/http_client" }
 http_client_tls = { path = "crates/http_client_tls" }
 icons = { path = "crates/icons" }
 image_viewer = { path = "crates/image_viewer" }
-edit_prediction_types = { path = "crates/edit_prediction_types" }
-edit_prediction_ui = { path = "crates/edit_prediction_ui" }
+edit_prediction = { path = "crates/edit_prediction" }
+edit_prediction_button = { path = "crates/edit_prediction_button" }
 edit_prediction_context = { path = "crates/edit_prediction_context" }
+zeta2_tools = { path = "crates/zeta2_tools" }
 inspector_ui = { path = "crates/inspector_ui" }
 install_cli = { path = "crates/install_cli" }
 journal = { path = "crates/journal" }
@@ -355,6 +358,8 @@ panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
 perf = { path = "tooling/perf" }
 picker = { path = "crates/picker" }
+plugin = { path = "crates/plugin" }
+plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
 settings_profile_selector = { path = "crates/settings_profile_selector" }
 project = { path = "crates/project" }
@@ -365,10 +370,12 @@ proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
+scheduler = { path = "crates/scheduler" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
+rich_text = { path = "crates/rich_text" }
 rodio = { git = "https://github.com/RustAudio/rodio", rev ="e2074c6c2acf07b57cf717e076bdda7a9ac6e70b", features = ["wav", "playback", "wav_output", "recording"] }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
@@ -385,6 +392,7 @@ snippets_ui = { path = "crates/snippets_ui" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
+storybook = { path = "crates/storybook" }
 streaming_diff = { path = "crates/streaming_diff" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
@@ -401,6 +409,7 @@ terminal_view = { path = "crates/terminal_view" }
 text = { path = "crates/text" }
 theme = { path = "crates/theme" }
 theme_extension = { path = "crates/theme_extension" }
+theme_importer = { path = "crates/theme_importer" }
 theme_selector = { path = "crates/theme_selector" }
 time_format = { path = "crates/time_format" }
 title_bar = { path = "crates/title_bar" }
@@ -424,17 +433,15 @@ x_ai = { path = "crates/x_ai" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
 zed_env_vars = { path = "crates/zed_env_vars" }
-edit_prediction = { path = "crates/edit_prediction" }
+zeta = { path = "crates/zeta" }
 zlog = { path = "crates/zlog" }
 zlog_settings = { path = "crates/zlog_settings" }
-ztracing = { path = "crates/ztracing" }
-ztracing_macro = { path = "crates/ztracing_macro" }

 #
 # External crates
 #

-agent-client-protocol = { version = "=0.9.0", features = ["unstable"] }
+agent-client-protocol = { version = "=0.8.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = "0.25.1-rc1"
 any_vec = "0.14"
@@ -501,11 +508,13 @@ exec = "0.3.1"
 fancy-regex = "0.16.0"
 fork = "0.4.0"
 futures = "0.3"
+futures-batch = "0.6.1"
 futures-lite = "1.13"
 gh-workflow = { git = "https://github.com/zed-industries/gh-workflow", rev = "09acfdf2bd5c1d6254abefd609c808ff73547b2c" }
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
 handlebars = "4.3"
+hashbrown = "0.15.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
@@ -541,6 +550,7 @@ nanoid = "0.4"
 nbformat = "0.15.0"
 nix = "0.29"
 num-format = "0.4.4"
+num-traits = "0.2"
 objc = "0.2"
 objc2-foundation = { version = "=0.3.1", default-features = false, features = [
    "NSArray",
@@ -579,6 +589,7 @@ pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev =
 pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
+pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
@@ -618,6 +629,7 @@ scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197
 schemars = { version = "1.0", features = ["indexmap2"] }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0.221", features = ["derive", "rc"] }
+serde_derive = "1.0.221"
 serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] }
 serde_json_lenient = { version = "0.2", features = [
    "preserve_order",
@@ -629,6 +641,7 @@ serde_urlencoded = "0.7"
 sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
+similar = "2.6"
 simplelog = "0.12.2"
 slotmap = "1.0.6"
 smallvec = { version = "1.6", features = ["union"] }
@@ -683,7 +696,6 @@ tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.24"
 tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-typescript", rev = "e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899" } # https://github.com/tree-sitter/tree-sitter-typescript/pull/347
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
-tracing = "0.1.40"
 unicase = "2.6"
 unicode-script = "0.5.7"
 unicode-segmentation = "1.10"
@@ -707,6 +719,7 @@ wasmtime-wasi = "29"
 wax = "0.6"
 which = "6.0.0"
 windows-core = "0.61"
+wit-component = "0.221"
 yawc = "0.2.5"
 zeroize = "1.8"
 zstd = "0.11"
@@ -788,13 +801,20 @@ settings_macros = { opt-level = 3 }
 sqlez_macros = { opt-level = 3, codegen-units = 1 }
 ui_macros = { opt-level = 3 }
 util_macros = { opt-level = 3 }
+serde_derive = { opt-level = 3 }
 quote = { opt-level = 3 }
 syn = { opt-level = 3 }
 proc-macro2 = { opt-level = 3 }
 # proc-macros end

 taffy = { opt-level = 3 }
+cranelift-codegen = { opt-level = 3 }
+cranelift-codegen-meta = { opt-level = 3 }
+cranelift-codegen-shared = { opt-level = 3 }
 resvg = { opt-level = 3 }
+rustybuzz = { opt-level = 3 }
+ttf-parser = { opt-level = 3 }
+wasmtime-cranelift = { opt-level = 3 }
 wasmtime = { opt-level = 3 }
 # Build single-source-file crates with cg=1 as it helps make `cargo build` of a whole workspace a bit faster
 activity_indicator = { codegen-units = 1 }
@@ -803,11 +823,12 @@ breadcrumbs = { codegen-units = 1 }
 collections = { codegen-units = 1 }
 command_palette = { codegen-units = 1 }
 command_palette_hooks = { codegen-units = 1 }
+extension_cli = { codegen-units = 1 }
 feature_flags = { codegen-units = 1 }
 file_icons = { codegen-units = 1 }
 fsevent = { codegen-units = 1 }
 image_viewer = { codegen-units = 1 }
-edit_prediction_ui = { codegen-units = 1 }
+edit_prediction_button = { codegen-units = 1 }
 install_cli = { codegen-units = 1 }
 journal = { codegen-units = 1 }
 json_schema_store = { codegen-units = 1 }
@@ -822,6 +843,7 @@ project_symbols = { codegen-units = 1 }
 refineable = { codegen-units = 1 }
 release_channel = { codegen-units = 1 }
 reqwest_client = { codegen-units = 1 }
+rich_text = { codegen-units = 1 }
 session = { codegen-units = 1 }
 snippet = { codegen-units = 1 }
 snippets_ui = { codegen-units = 1 }
--- a/4
+++ b/4
@@ -34,4 +34,8 @@ RUN apt-get update; \
    linux-perf binutils
 WORKDIR app
 COPY --from=builder /app/collab /app/collab
+COPY --from=builder /app/crates/collab/migrations /app/migrations
+COPY --from=builder /app/crates/collab/migrations_llm /app/migrations_llm
+ENV MIGRATIONS_PATH=/app/migrations
+ENV LLM_DATABASE_MIGRATIONS_PATH=/app/migrations_llm
 ENTRYPOINT ["/app/collab"]
--- a/assets/icons/git_branch_plus.svg
+++ b/assets/icons/git_branch_plus.svg
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 2V10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 6C12.5304 6 13.0391 5.78929 13.4142 5.41421C13.7893 5.03914 14 4.53043 14 4C14 3.46957 13.7893 2.96086 13.4142 2.58579C13.0391 2.21071 12.5304 2 12 2C11.4696 2 10.9609 2.21071 10.5858 2.58579C10.2107 2.96086 10 3.46957 10 4C10 4.53043 10.2107 5.03914 10.5858 5.41421C10.9609 5.78929 11.4696 6 12 6Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 14C4.53043 14 5.03914 13.7893 5.41421 13.4142C5.78929 13.0391 6 12.5304 6 12C6 11.4696 5.78929 10.9609 5.41421 10.5858C5.03914 10.2107 4.53043 10 4 10C3.46957 10 2.96086 10.2107 2.58579 10.5858C2.21071 10.9609 2 11.4696 2 12C2 12.5304 2.21071 13.0391 2.58579 13.4142C2.96086 13.7893 3.46957 14 4 14Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 4C8.4087 4 6.88258 4.63214 5.75736 5.75736C4.63214 6.88258 4 8.4087 4 10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 10V14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 12H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/inception.svg
+++ b/assets/icons/inception.svg
@@ -1,11 +0,0 @@
-<svg width="28" height="28" viewBox="0 0 28 28" fill="none" id="svg1378540956_510">
-<g clip-path="url(#svg1378540956_510_clip0_1_1506)" transform="translate(4, 4) scale(0.857)">
-<path d="M17.0547 0.372066H8.52652L-0.00165176 8.90024V17.4284H8.52652V8.90024H17.0547V0.372066Z" fill="#1A1C20"></path>
-<path d="M10.1992 27.6279H18.7274L27.2556 19.0998V10.5716H18.7274V19.0998H10.1992V27.6279Z" fill="#1A1C20"></path>
-</g>
-<defs>
-<clipPath id="svg1378540956_510_clip0_1_1506">
-<rect width="27.2559" height="27.2559" fill="white" transform="translate(0 0.37207)"></rect>
-</clipPath>
-</defs>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -41,7 +41,7 @@
      "ctrl-f11": "debugger::StepInto",
      "shift-f11": "debugger::StepOut",
      "f11": "zed::ToggleFullScreen",
-      "ctrl-alt-z": "edit_prediction::RatePredictions",
+      "ctrl-alt-z": "edit_prediction::RateCompletions",
      "ctrl-alt-shift-i": "edit_prediction::ToggleMenu",
      "ctrl-alt-l": "lsp_tool::ToggleMenu"
    }
@@ -616,8 +616,8 @@
      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
      "ctrl-t": "project_symbols::Toggle",
      "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "ctrl-tab": "tab_switcher::Toggle",
+      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "ctrl-e": "file_finder::Toggle",
      "f1": "command_palette::Toggle",
      "ctrl-shift-p": "command_palette::Toggle",
@@ -811,10 +811,7 @@
    "context": "PromptEditor",
    "bindings": {
      "ctrl-[": "agent::CyclePreviousInlineAssist",
-      "ctrl-]": "agent::CycleNextInlineAssist",
-      "ctrl-shift-enter": "inline_assistant::ThumbsUpResult",
-      "ctrl-shift-backspace": "inline_assistant::ThumbsDownResult"
-
+      "ctrl-]": "agent::CycleNextInlineAssist"
    }
  },
  {
@@ -1325,18 +1322,25 @@
    }
  },
  {
-    "context": "EditPredictionContext > Editor",
+    "context": "Zeta2Feedback > Editor",
    "bindings": {
-      "alt-left": "dev::EditPredictionContextGoBack",
-      "alt-right": "dev::EditPredictionContextGoForward"
+      "enter": "editor::Newline",
+      "ctrl-enter up": "dev::Zeta2RatePredictionPositive",
+      "ctrl-enter down": "dev::Zeta2RatePredictionNegative"
+    }
+  },
+  {
+    "context": "Zeta2Context > Editor",
+    "bindings": {
+      "alt-left": "dev::Zeta2ContextGoBack",
+      "alt-right": "dev::Zeta2ContextGoForward"
    }
  },
  {
    "context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
    "use_key_equivalents": true,
    "bindings": {
-      "ctrl-shift-backspace": "branch_picker::DeleteBranch",
-      "ctrl-shift-i": "branch_picker::FilterRemotes"
+      "ctrl-shift-backspace": "branch_picker::DeleteBranch"
    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -47,7 +47,7 @@
      "cmd-m": "zed::Minimize",
      "fn-f": "zed::ToggleFullScreen",
      "ctrl-cmd-f": "zed::ToggleFullScreen",
-      "ctrl-cmd-z": "edit_prediction::RatePredictions",
+      "ctrl-cmd-z": "edit_prediction::RateCompletions",
      "ctrl-cmd-i": "edit_prediction::ToggleMenu",
      "ctrl-cmd-l": "lsp_tool::ToggleMenu",
      "ctrl-cmd-c": "editor::DisplayCursorNames"
@@ -684,8 +684,8 @@
      "ctrl-alt-cmd-p": "settings_profile_selector::Toggle",
      "cmd-t": "project_symbols::Toggle",
      "cmd-p": "file_finder::Toggle",
-      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "ctrl-tab": "tab_switcher::Toggle",
+      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "cmd-shift-p": "command_palette::Toggle",
      "cmd-shift-m": "diagnostics::Deploy",
      "cmd-shift-e": "project_panel::ToggleFocus",
@@ -878,9 +878,7 @@
    "bindings": {
      "cmd-alt-/": "agent::ToggleModelSelector",
      "ctrl-[": "agent::CyclePreviousInlineAssist",
-      "ctrl-]": "agent::CycleNextInlineAssist",
-      "cmd-shift-enter": "inline_assistant::ThumbsUpResult",
-      "cmd-shift-backspace": "inline_assistant::ThumbsDownResult"
+      "ctrl-]": "agent::CycleNextInlineAssist"
    }
  },
  {
@@ -1429,18 +1427,25 @@
    }
  },
  {
-    "context": "EditPredictionContext > Editor",
+    "context": "Zeta2Feedback > Editor",
    "bindings": {
-      "alt-left": "dev::EditPredictionContextGoBack",
-      "alt-right": "dev::EditPredictionContextGoForward"
+      "enter": "editor::Newline",
+      "cmd-enter up": "dev::Zeta2RatePredictionPositive",
+      "cmd-enter down": "dev::Zeta2RatePredictionNegative"
+    }
+  },
+  {
+    "context": "Zeta2Context > Editor",
+    "bindings": {
+      "alt-left": "dev::Zeta2ContextGoBack",
+      "alt-right": "dev::Zeta2ContextGoForward"
    }
  },
  {
    "context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-shift-backspace": "branch_picker::DeleteBranch",
-      "cmd-shift-i": "branch_picker::FilterRemotes"
+      "cmd-shift-backspace": "branch_picker::DeleteBranch"
    }
  }
 ]
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -24,8 +24,7 @@
      "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
      "ctrl-shift-w": "workspace::CloseWindow",
      "shift-escape": "workspace::ToggleZoom",
-      "ctrl-o": "workspace::OpenFiles",
-      "ctrl-k ctrl-o": "workspace::Open",
+      "ctrl-o": "workspace::Open",
      "ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
      "ctrl-shift-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
      "ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
@@ -609,8 +608,8 @@
      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
      "ctrl-t": "project_symbols::Toggle",
      "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "ctrl-tab": "tab_switcher::Toggle",
+      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "ctrl-e": "file_finder::Toggle",
      "f1": "command_palette::Toggle",
      "ctrl-shift-p": "command_palette::Toggle",
@@ -816,9 +815,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-[": "agent::CyclePreviousInlineAssist",
-      "ctrl-]": "agent::CycleNextInlineAssist",
-      "ctrl-shift-enter": "inline_assistant::ThumbsUpResult",
-      "ctrl-shift-delete": "inline_assistant::ThumbsDownResult"
+      "ctrl-]": "agent::CycleNextInlineAssist"
    }
  },
  {
@@ -1131,8 +1128,6 @@
      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
      "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
-      "ctrl-q": ["terminal::SendKeystroke", "ctrl-q"],
-      "ctrl-r": ["terminal::SendKeystroke", "ctrl-r"],
      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
      "ctrl-shift-a": "editor::SelectAll",
      "ctrl-shift-f": "buffer_search::Deploy",
@@ -1346,18 +1341,25 @@
    }
  },
  {
-    "context": "EditPredictionContext > Editor",
+    "context": "Zeta2Feedback > Editor",
    "bindings": {
-      "alt-left": "dev::EditPredictionContextGoBack",
-      "alt-right": "dev::EditPredictionContextGoForward"
+      "enter": "editor::Newline",
+      "ctrl-enter up": "dev::Zeta2RatePredictionPositive",
+      "ctrl-enter down": "dev::Zeta2RatePredictionNegative"
+    }
+  },
+  {
+    "context": "Zeta2Context > Editor",
+    "bindings": {
+      "alt-left": "dev::Zeta2ContextGoBack",
+      "alt-right": "dev::Zeta2ContextGoForward"
    }
  },
  {
    "context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
    "use_key_equivalents": true,
    "bindings": {
-      "ctrl-shift-backspace": "branch_picker::DeleteBranch",
-      "ctrl-shift-i": "branch_picker::FilterRemotes"
+      "ctrl-shift-backspace": "branch_picker::DeleteBranch"
    }
  }
 ]
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -902,11 +902,7 @@
    "context": "!Editor && !Terminal",
    "bindings": {
      ":": "command_palette::Toggle",
-      "g /": "pane::DeploySearch",
-      "] b": "pane::ActivateNextItem",
-      "[ b": "pane::ActivatePreviousItem",
-      "] shift-b": "pane::ActivateLastItem",
-      "[ shift-b": ["pane::ActivateItem", 0]
+      "g /": "pane::DeploySearch"
    }
  },
  {
--- a/assets/prompts/content_prompt_v2.hbs
+++ b/assets/prompts/content_prompt_v2.hbs
@@ -1,44 +0,0 @@
-{{#if language_name}}
-Here's a file of {{language_name}} that the user is going to ask you to make an edit to.
-{{else}}
-Here's a file of text that the user is going to ask you to make an edit to.
-{{/if}}
-
-The section you'll need to rewrite is marked with <rewrite_this></rewrite_this> tags.
-
-<document>
-{{{document_content}}}
-</document>
-
-{{#if is_truncated}}
-The context around the relevant section has been truncated (possibly in the middle of a line) for brevity.
-{{/if}}
-
-{{#if rewrite_section}}
-And here's the section to rewrite based on that prompt again for reference:
-
-<rewrite_this>
-{{{rewrite_section}}}
-</rewrite_this>
-
-{{#if diagnostic_errors}}
-Below are the diagnostic errors visible to the user.  If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.
-
-{{#each diagnostic_errors}}
-<diagnostic_error>
-    <line_number>{{line_number}}</line_number>
-    <error_message>{{error_message}}</error_message>
-    <code_content>{{code_content}}</code_content>
-</diagnostic_error>
-{{/each}}
-{{/if}}
-
-{{/if}}
-
-Only make changes that are necessary to fulfill the prompt, leave everything else as-is. All surrounding {{content_type}} will be preserved.
-
-Start at the indentation level in the original file in the rewritten {{content_type}}.
-
-You must use one of the provided tools to make the rewrite or to provide an explanation as to why the user's request cannot be fulfilled. It is an error if
-you simply send back unstructured text. If you need to make a statement or ask a question you must use one of the tools to do so.
-It is an error if you try to make a change that cannot be made simply by editing the rewrite_section.
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -12,7 +12,7 @@
  "theme": {
    "mode": "system",
    "light": "One Light",
-    "dark": "One Dark"
+    "dark": "One Dark",
  },
  "icon_theme": "Zed (Default)",
  // The name of a base set of key bindings to use.
@@ -29,7 +29,7 @@
  // Features that can be globally enabled or disabled
  "features": {
    // Which edit prediction provider to use.
-    "edit_prediction_provider": "zed"
+    "edit_prediction_provider": "zed",
  },
  // The name of a font to use for rendering text in the editor
  // ".ZedMono" currently aliases to Lilex
@@ -69,7 +69,7 @@
  // The OpenType features to enable for text in the UI
  "ui_font_features": {
    // Disable ligatures:
-    "calt": false
+    "calt": false,
  },
  // The weight of the UI font in standard CSS units from 100 to 900.
  "ui_font_weight": 400,
@@ -87,7 +87,7 @@
    "border_size": 0.0,
    // Opacity of the inactive panes. 0 means transparent, 1 means opaque.
    // Values are clamped to the [0.0, 1.0] range.
-    "inactive_opacity": 1.0
+    "inactive_opacity": 1.0,
  },
  // Layout mode of the bottom dock. Defaults to "contained"
  //   choices: contained, full, left_aligned, right_aligned
@@ -103,12 +103,12 @@
    "left_padding": 0.2,
    // The relative width of the right padding of the central pane from the
    // workspace when the centered layout is used.
-    "right_padding": 0.2
+    "right_padding": 0.2,
  },
  // Image viewer settings
  "image_viewer": {
    // The unit for image file sizes: "binary" (KiB, MiB) or decimal (KB, MB)
-    "unit": "binary"
+    "unit": "binary",
  },
  // Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
  //
@@ -296,7 +296,7 @@
    // When true, enables drag and drop text selection in buffer.
    "enabled": true,
    // The delay in milliseconds that must elapse before drag and drop is allowed. Otherwise, a new text selection is created.
-    "delay": 300
+    "delay": 300,
  },
  // What to do when go to definition yields no results.
  //
@@ -400,14 +400,14 @@
  // Visible characters used to render whitespace when show_whitespaces is enabled.
  "whitespace_map": {
    "space": "•",
-    "tab": "→"
+    "tab": "→",
  },
  // Settings related to calls in Zed
  "calls": {
    // Join calls with the microphone live by default
    "mute_on_join": false,
    // Share your project when you are the first to join a channel
-    "share_on_join": false
+    "share_on_join": false,
  },
  // Toolbar related settings
  "toolbar": {
@@ -420,7 +420,7 @@
    // Whether to show agent review buttons in the editor toolbar.
    "agent_review": true,
    // Whether to show code action buttons in the editor toolbar.
-    "code_actions": false
+    "code_actions": false,
  },
  // Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
  "use_system_window_tabs": false,
@@ -439,7 +439,7 @@
    // Whether to show the sign in button in the titlebar.
    "show_sign_in": true,
    // Whether to show the menus in the titlebar.
-    "show_menus": false
+    "show_menus": false,
  },
  "audio": {
    // Opt into the new audio system.
@@ -472,7 +472,7 @@
    // the future we will migrate by setting this to false
    //
    // You need to rejoin a call for this setting to apply
-    "experimental.legacy_audio_compatible": true
+    "experimental.legacy_audio_compatible": true,
  },
  // Scrollbar related settings
  "scrollbar": {
@@ -511,8 +511,8 @@
      // When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
      "horizontal": true,
      // When false, forcefully disables the vertical scrollbar. Otherwise, obey other settings.
-      "vertical": true
-    }
+      "vertical": true,
+    },
  },
  // Minimap related settings
  "minimap": {
@@ -560,7 +560,7 @@
    // 3. "gutter" or "none" to not highlight the current line in the minimap.
    "current_line_highlight": null,
    // Maximum number of columns to display in the minimap.
-    "max_width_columns": 80
+    "max_width_columns": 80,
  },
  // Enable middle-click paste on Linux.
  "middle_click_paste": true,
@@ -583,7 +583,7 @@
    // Whether to show fold buttons in the gutter.
    "folds": true,
    // Minimum number of characters to reserve space for in the gutter.
-    "min_line_number_digits": 4
+    "min_line_number_digits": 4,
  },
  "indent_guides": {
    // Whether to show indent guides in the editor.
@@ -604,7 +604,7 @@
    //
    // 1. "disabled"
    // 2. "indent_aware"
-    "background_coloring": "disabled"
+    "background_coloring": "disabled",
  },
  // Whether the editor will scroll beyond the last line.
  "scroll_beyond_last_line": "one_page",
@@ -623,7 +623,7 @@
  "fast_scroll_sensitivity": 4.0,
  "sticky_scroll": {
    // Whether to stick scopes to the top of the editor.
-    "enabled": false
+    "enabled": false,
  },
  "relative_line_numbers": "disabled",
  // If 'search_wrap' is disabled, search result do not wrap around the end of the file.
@@ -641,7 +641,7 @@
    // Whether to interpret the search query as a regular expression.
    "regex": false,
    // Whether to center the cursor on each search match when navigating.
-    "center_on_match": false
+    "center_on_match": false,
  },
  // When to populate a new search's query based on the text under the cursor.
  // This setting can take the following three values:
@@ -684,8 +684,8 @@
      "shift": false,
      "alt": false,
      "platform": false,
-      "function": false
-    }
+      "function": false,
+    },
  },
  // Whether to resize all the panels in a dock when resizing the dock.
  // Can be a combination of "left", "right" and "bottom".
@@ -733,7 +733,7 @@
      //    "always"
      // 5. Never show the scrollbar:
      //    "never"
-      "show": null
+      "show": null,
    },
    // Which files containing diagnostic errors/warnings to mark in the project panel.
    // This setting can take the following three values:
@@ -756,7 +756,7 @@
      //    "always"
      // 2. Never show indent guides:
      //    "never"
-      "show": "always"
+      "show": "always",
    },
    // Sort order for entries in the project panel.
    // This setting can take three values:
@@ -781,8 +781,8 @@
      // Whether to automatically open files after pasting or duplicating them.
      "on_paste": true,
      // Whether to automatically open files dropped from external sources.
-      "on_drop": true
-    }
+      "on_drop": true,
+    },
  },
  "outline_panel": {
    // Whether to show the outline panel button in the status bar
@@ -815,7 +815,7 @@
      //    "always"
      // 2. Never show indent guides:
      //    "never"
-      "show": "always"
+      "show": "always",
    },
    // Scrollbar-related settings
    "scrollbar": {
@@ -832,11 +832,11 @@
      //    "always"
      // 5. Never show the scrollbar:
      //    "never"
-      "show": null
+      "show": null,
    },
    // Default depth to expand outline items in the current file.
    // Set to 0 to collapse all items that have children, 1 or higher to collapse items at that depth or deeper.
-    "expand_outlines_with_depth": 100
+    "expand_outlines_with_depth": 100,
  },
  "collaboration_panel": {
    // Whether to show the collaboration panel button in the status bar.
@@ -844,7 +844,7 @@
    // Where to dock the collaboration panel. Can be 'left' or 'right'.
    "dock": "left",
    // Default width of the collaboration panel.
-    "default_width": 240
+    "default_width": 240,
  },
  "git_panel": {
    // Whether to show the git panel button in the status bar.
@@ -876,12 +876,12 @@
      // Choices: always, auto, never, system
      // Default: inherits editor scrollbar settings
      // "show": null
-    }
+    },
  },
  "message_editor": {
    // Whether to automatically replace emoji shortcodes with emoji characters.
    // For example: typing `:wave:` gets replaced with `👋`.
-    "auto_replace_emoji_shortcode": true
+    "auto_replace_emoji_shortcode": true,
  },
  "notification_panel": {
    // Whether to show the notification panel button in the status bar.
@@ -889,7 +889,7 @@
    // Where to dock the notification panel. Can be 'left' or 'right'.
    "dock": "right",
    // Default width of the notification panel.
-    "default_width": 380
+    "default_width": 380,
  },
  "agent": {
    // Whether the agent is enabled.
@@ -911,7 +911,7 @@
      // The provider to use.
      "provider": "zed.dev",
      // The model to use.
-      "model": "claude-sonnet-4"
+      "model": "claude-sonnet-4",
    },
    // Additional parameters for language model requests. When making a request to a model, parameters will be taken
    // from the last entry in this list that matches the model's provider and name. In each entry, both provider
@@ -966,8 +966,8 @@
          "grep": true,
          "terminal": true,
          "thinking": true,
-          "web_search": true
-        }
+          "web_search": true,
+        },
      },
      "ask": {
        "name": "Ask",
@@ -984,14 +984,14 @@
          "open": true,
          "grep": true,
          "thinking": true,
-          "web_search": true
-        }
+          "web_search": true,
+        },
      },
      "minimal": {
        "name": "Minimal",
        "enable_all_context_servers": false,
-        "tools": {}
-      }
+        "tools": {},
+      },
    },
    // Where to show notifications when the agent has either completed
    // its response, or else needs confirmation before it can run a
@@ -1020,7 +1020,7 @@
    // Minimum number of lines to display in the agent message editor.
    //
    // Default: 4
-    "message_editor_min_lines": 4
+    "message_editor_min_lines": 4,
  },
  // Whether the screen sharing icon is shown in the os status bar.
  "show_call_status_icon": true,
@@ -1055,7 +1055,7 @@
    // Whether or not to show the navigation history buttons.
    "show_nav_history_buttons": true,
    // Whether or not to show the tab bar buttons.
-    "show_tab_bar_buttons": true
+    "show_tab_bar_buttons": true,
  },
  // Settings related to the editor's tabs
  "tabs": {
@@ -1094,7 +1094,7 @@
    //    "errors"
    // 3. Mark files with errors and warnings:
    //    "all"
-    "show_diagnostics": "off"
+    "show_diagnostics": "off",
  },
  // Settings related to preview tabs.
  "preview_tabs": {
@@ -1115,7 +1115,7 @@
    "enable_preview_file_from_code_navigation": true,
    // Whether to keep tabs in preview mode when code navigation is used to navigate away from them.
    // If `enable_preview_file_from_code_navigation` or `enable_preview_multibuffer_from_code_navigation` is also true, the new tab may replace the existing one.
-    "enable_keep_preview_on_code_navigation": false
+    "enable_keep_preview_on_code_navigation": false,
  },
  // Settings related to the file finder.
  "file_finder": {
@@ -1159,7 +1159,7 @@
    //   * "all": Use all gitignored files
    //   * "indexed": Use only the files Zed had indexed
    //   * "smart": Be smart and search for ignored when called from a gitignored worktree
-    "include_ignored": "smart"
+    "include_ignored": "smart",
  },
  // Whether or not to remove any trailing whitespace from lines of a buffer
  // before saving it.
@@ -1230,7 +1230,7 @@
    // Send debug info like crash reports.
    "diagnostics": true,
    // Send anonymized usage data like what languages you're using Zed with.
-    "metrics": true
+    "metrics": true,
  },
  // Whether to disable all AI features in Zed.
  //
@@ -1264,7 +1264,7 @@
      "enabled": true,
      // Minimum time to wait before pulling diagnostics from the language server(s).
      // 0 turns the debounce off.
-      "debounce_ms": 50
+      "debounce_ms": 50,
    },
    // Settings for inline diagnostics
    "inline": {
@@ -1282,8 +1282,8 @@
      "min_column": 0,
      // The minimum severity of the diagnostics to show inline.
      // Inherits editor's diagnostics' max severity settings when `null`.
-      "max_severity": null
-    }
+      "max_severity": null,
+    },
  },
  // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
  // scans, file searches, and not be displayed in the project file tree. Takes precedence over `file_scan_inclusions`.
@@ -1297,7 +1297,7 @@
    "**/.DS_Store",
    "**/Thumbs.db",
    "**/.classpath",
-    "**/.settings"
+    "**/.settings",
  ],
  // Files or globs of files that will be included by Zed, even when ignored by git. This is useful
  // for files that are not tracked by git, but are still important to your project. Note that globs
@@ -1332,14 +1332,14 @@
      // Whether or not to display the git commit summary on the same line.
      "show_commit_summary": false,
      // The minimum column number to show the inline blame information at
-      "min_column": 0
+      "min_column": 0,
    },
    "blame": {
-      "show_avatar": true
+      "show_avatar": true,
    },
    // Control which information is shown in the branch picker.
    "branch_picker": {
-      "show_author_name": true
+      "show_author_name": true,
    },
    // How git hunks are displayed visually in the editor.
    // This setting can take two values:
@@ -1351,7 +1351,7 @@
    "hunk_style": "staged_hollow",
    // Should the name or path be displayed first in the git view.
    // "path_style": "file_name_first" or "file_path_first"
-    "path_style": "file_name_first"
+    "path_style": "file_name_first",
  },
  // The list of custom Git hosting providers.
  "git_hosting_providers": [
@@ -1385,7 +1385,7 @@
      "**/secrets.yml",
      "**/.zed/settings.json", // zed project settings
      "/**/zed/settings.json", // zed user settings
-      "/**/zed/keymap.json"
+      "/**/zed/keymap.json",
    ],
    // When to show edit predictions previews in buffer.
    // This setting takes two possible values:
@@ -1403,15 +1403,15 @@
    "copilot": {
      "enterprise_uri": null,
      "proxy": null,
-      "proxy_no_verify": null
+      "proxy_no_verify": null,
    },
    "codestral": {
      "model": null,
-      "max_tokens": null
+      "max_tokens": null,
    },
    // Whether edit predictions are enabled when editing text threads in the agent panel.
    // This setting has no effect if globally disabled.
-    "enabled_in_text_threads": true
+    "enabled_in_text_threads": true,
  },
  // Settings specific to journaling
  "journal": {
@@ -1421,7 +1421,7 @@
    // May take 2 values:
    // 1. hour12
    // 2. hour24
-    "hour_format": "hour12"
+    "hour_format": "hour12",
  },
  // Status bar-related settings.
  "status_bar": {
@@ -1432,7 +1432,7 @@
    // Whether to show the cursor position button in the status bar.
    "cursor_position_button": true,
    // Whether to show active line endings button in the status bar.
-    "line_endings_button": false
+    "line_endings_button": false,
  },
  // Settings specific to the terminal
  "terminal": {
@@ -1553,8 +1553,8 @@
        // Preferred Conda manager to use when activating Conda environments.
        // Values: "auto", "conda", "mamba", "micromamba"
        // Default: "auto"
-        "conda_manager": "auto"
-      }
+        "conda_manager": "auto",
+      },
    },
    "toolbar": {
      // Whether to display the terminal title in its toolbar's breadcrumbs.
@@ -1562,7 +1562,7 @@
      //
      // The shell running in the terminal needs to be configured to emit the title.
      // Example: `echo -e "\e]2;New Title\007";`
-      "breadcrumbs": false
+      "breadcrumbs": false,
    },
    // Scrollbar-related settings
    "scrollbar": {
@@ -1579,7 +1579,7 @@
      //    "always"
      // 5. Never show the scrollbar:
      //    "never"
-      "show": null
+      "show": null,
    },
    // Set the terminal's font size. If this option is not included,
    // the terminal will default to matching the buffer's font size.
@@ -1660,12 +1660,12 @@
        "# which may be followed by trailing punctuation",
        "[.,:)}\\]>]*",
        "# and always includes trailing whitespace or end of line",
-        "([ ]+|$)"
-      ]
+        "([ ]+|$)",
+      ],
    ],
    // Timeout for hover and Cmd-click path hyperlink discovery in milliseconds. Specifying a
    // timeout of `0` will disable path hyperlinking in terminal.
-    "path_hyperlink_timeout_ms": 1
+    "path_hyperlink_timeout_ms": 1,
  },
  "code_actions_on_format": {},
  // Settings related to running tasks.
@@ -1681,7 +1681,7 @@
    // * Zed task from history (e.g. one-off task was spawned before)
    //
    // Default: true
-    "prefer_lsp": true
+    "prefer_lsp": true,
  },
  // An object whose keys are language names, and whose values
  // are arrays of filenames or extensions of files that should
@@ -1698,7 +1698,7 @@
  "file_types": {
    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json", "tsconfig*.json"],
    "Markdown": [".rules", ".cursorrules", ".windsurfrules", ".clinerules"],
-    "Shell Script": [".env.*"]
+    "Shell Script": [".env.*"],
  },
  // Settings for which version of Node.js and NPM to use when installing
  // language servers and Copilot.
@@ -1714,14 +1714,14 @@
    // `path`, but not `npm_path`, Zed will assume that `npm` is located at
    // `${path}/../npm`.
    "path": null,
-    "npm_path": null
+    "npm_path": null,
  },
  // The extensions that Zed should automatically install on startup.
  //
  // If you don't want any of these extensions, add this field to your settings
  // and change the value to `false`.
  "auto_install_extensions": {
-    "html": true
+    "html": true,
  },
  // The capabilities granted to extensions.
  //
@@ -1729,7 +1729,7 @@
  "granted_extension_capabilities": [
    { "kind": "process:exec", "command": "*", "args": ["**"] },
    { "kind": "download_file", "host": "*", "path": ["**"] },
-    { "kind": "npm:install", "package": "*" }
+    { "kind": "npm:install", "package": "*" },
  ],
  // Controls how completions are processed for this language.
  "completions": {
@@ -1780,7 +1780,7 @@
    // 4. "replace_suffix"
    //   Behaves like `"replace"` if the text after the cursor is a suffix of the completion, and like
    //   `"insert"` otherwise.
-    "lsp_insert_mode": "replace_suffix"
+    "lsp_insert_mode": "replace_suffix",
  },
  // Different settings for specific languages.
  "languages": {
@@ -1788,113 +1788,113 @@
      "language_servers": ["astro-language-server", "..."],
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-astro"]
-      }
+        "plugins": ["prettier-plugin-astro"],
+      },
    },
    "Blade": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "C": {
      "format_on_save": "off",
      "use_on_type_format": false,
      "prettier": {
-        "allowed": false
-      }
+        "allowed": false,
+      },
    },
    "C++": {
      "format_on_save": "off",
      "use_on_type_format": false,
      "prettier": {
-        "allowed": false
-      }
+        "allowed": false,
+      },
    },
    "CSS": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "Dart": {
-      "tab_size": 2
+      "tab_size": 2,
    },
    "Diff": {
      "show_edit_predictions": false,
      "remove_trailing_whitespace_on_save": false,
-      "ensure_final_newline_on_save": false
+      "ensure_final_newline_on_save": false,
    },
    "Elixir": {
-      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."]
+      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."],
    },
    "Elm": {
-      "tab_size": 4
+      "tab_size": 4,
    },
    "Erlang": {
-      "language_servers": ["erlang-ls", "!elp", "..."]
+      "language_servers": ["erlang-ls", "!elp", "..."],
    },
    "Git Commit": {
      "allow_rewrap": "anywhere",
      "soft_wrap": "editor_width",
-      "preferred_line_length": 72
+      "preferred_line_length": 72,
    },
    "Go": {
      "hard_tabs": true,
      "code_actions_on_format": {
-        "source.organizeImports": true
+        "source.organizeImports": true,
      },
-      "debuggers": ["Delve"]
+      "debuggers": ["Delve"],
    },
    "GraphQL": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "HEEX": {
-      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."]
+      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."],
    },
    "HTML": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "HTML+ERB": {
-      "language_servers": ["herb", "!ruby-lsp", "..."]
+      "language_servers": ["herb", "!ruby-lsp", "..."],
    },
    "Java": {
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-java"]
-      }
+        "plugins": ["prettier-plugin-java"],
+      },
    },
    "JavaScript": {
      "language_servers": ["!typescript-language-server", "vtsls", "..."],
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "JSON": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "JSONC": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "JS+ERB": {
-      "language_servers": ["!ruby-lsp", "..."]
+      "language_servers": ["!ruby-lsp", "..."],
    },
    "Kotlin": {
-      "language_servers": ["!kotlin-language-server", "kotlin-lsp", "..."]
+      "language_servers": ["!kotlin-language-server", "kotlin-lsp", "..."],
    },
    "LaTeX": {
      "formatter": "language_server",
      "language_servers": ["texlab", "..."],
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-latex"]
-      }
+        "plugins": ["prettier-plugin-latex"],
+      },
    },
    "Markdown": {
      "format_on_save": "off",
@@ -1903,135 +1903,132 @@
      "allow_rewrap": "anywhere",
      "soft_wrap": "editor_width",
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "PHP": {
      "language_servers": ["phpactor", "!intelephense", "!phptools", "..."],
      "prettier": {
        "allowed": true,
        "plugins": ["@prettier/plugin-php"],
-        "parser": "php"
-      }
+        "parser": "php",
+      },
    },
    "Plain Text": {
      "allow_rewrap": "anywhere",
-      "soft_wrap": "editor_width"
+      "soft_wrap": "editor_width",
    },
    "Python": {
      "code_actions_on_format": {
-        "source.organizeImports.ruff": true
+        "source.organizeImports.ruff": true,
      },
      "formatter": {
        "language_server": {
-          "name": "ruff"
-        }
+          "name": "ruff",
+        },
      },
      "debuggers": ["Debugpy"],
-      "language_servers": ["basedpyright", "ruff", "!ty", "!pyrefly", "!pyright", "!pylsp", "..."]
+      "language_servers": ["basedpyright", "ruff", "!ty", "!pyrefly", "!pyright", "!pylsp", "..."],
    },
    "Ruby": {
-      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."]
+      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."],
    },
    "Rust": {
-      "debuggers": ["CodeLLDB"]
+      "debuggers": ["CodeLLDB"],
    },
    "SCSS": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "Starlark": {
-      "language_servers": ["starpls", "!buck2-lsp", "..."]
+      "language_servers": ["starpls", "!buck2-lsp", "..."],
    },
    "Svelte": {
      "language_servers": ["svelte-language-server", "..."],
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-svelte"]
-      }
+        "plugins": ["prettier-plugin-svelte"],
+      },
    },
    "TSX": {
      "language_servers": ["!typescript-language-server", "vtsls", "..."],
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "Twig": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "TypeScript": {
      "language_servers": ["!typescript-language-server", "vtsls", "..."],
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "SystemVerilog": {
      "format_on_save": "off",
      "language_servers": ["!slang", "..."],
-      "use_on_type_format": false
+      "use_on_type_format": false,
    },
    "Vue.js": {
      "language_servers": ["vue-language-server", "vtsls", "..."],
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "XML": {
      "prettier": {
        "allowed": true,
-        "plugins": ["@prettier/plugin-xml"]
-      }
+        "plugins": ["@prettier/plugin-xml"],
+      },
    },
    "YAML": {
      "prettier": {
-        "allowed": true
-      }
+        "allowed": true,
+      },
    },
    "YAML+ERB": {
-      "language_servers": ["!ruby-lsp", "..."]
+      "language_servers": ["!ruby-lsp", "..."],
    },
    "Zig": {
-      "language_servers": ["zls", "..."]
-    }
+      "language_servers": ["zls", "..."],
+    },
  },
  // Different settings for specific language models.
  "language_models": {
-    "anthropic": {
-      "api_url": "https://api.anthropic.com"
-    },
    "bedrock": {},
    "google": {
-      "api_url": "https://generativelanguage.googleapis.com"
+      "api_url": "https://generativelanguage.googleapis.com",
    },
    "ollama": {
-      "api_url": "http://localhost:11434"
+      "api_url": "http://localhost:11434",
    },
    "openai": {
-      "api_url": "https://api.openai.com/v1"
+      "api_url": "https://api.openai.com/v1",
    },
    "openai_compatible": {},
    "open_router": {
-      "api_url": "https://openrouter.ai/api/v1"
+      "api_url": "https://openrouter.ai/api/v1",
    },
    "lmstudio": {
-      "api_url": "http://localhost:1234/api/v0"
+      "api_url": "http://localhost:1234/api/v0",
    },
    "deepseek": {
-      "api_url": "https://api.deepseek.com/v1"
+      "api_url": "https://api.deepseek.com/v1",
    },
    "mistral": {
-      "api_url": "https://api.mistral.ai/v1"
+      "api_url": "https://api.mistral.ai/v1",
    },
    "vercel": {
-      "api_url": "https://api.v0.dev/v1"
+      "api_url": "https://api.v0.dev/v1",
    },
    "x_ai": {
-      "api_url": "https://api.x.ai/v1"
+      "api_url": "https://api.x.ai/v1",
    },
-    "zed.dev": {}
+    "zed.dev": {},
  },
  "session": {
    // Whether or not to restore unsaved buffers on restart.
@@ -2040,7 +2037,7 @@
    // dirty files when closing the application.
    //
    // Default: true
-    "restore_unsaved_buffers": true
+    "restore_unsaved_buffers": true,
  },
  // Zed's Prettier integration settings.
  // Allows to enable/disable formatting with Prettier
@@ -2058,11 +2055,11 @@
    // "singleQuote": true
    // Forces Prettier integration to use a specific parser name when formatting files with the language
    // when set to a non-empty string.
-    "parser": ""
+    "parser": "",
  },
  // Settings for auto-closing of JSX tags.
  "jsx_tag_auto_close": {
-    "enabled": true
+    "enabled": true,
  },
  // LSP Specific settings.
  "lsp": {
@@ -2083,19 +2080,19 @@
    // Specify the DAP name as a key here.
    "CodeLLDB": {
      "env": {
-        "RUST_LOG": "info"
-      }
-    }
+        "RUST_LOG": "info",
+      },
+    },
  },
  // Common language server settings.
  "global_lsp_settings": {
    // Whether to show the LSP servers button in the status bar.
-    "button": true
+    "button": true,
  },
  // Jupyter settings
  "jupyter": {
    "enabled": true,
-    "kernel_selections": {}
+    "kernel_selections": {},
    // Specify the language name as the key and the kernel name as the value.
    // "kernel_selections": {
    //    "python": "conda-base"
@@ -2109,7 +2106,7 @@
    "max_columns": 128,
    // Maximum number of lines to keep in REPL's scrollback buffer.
    // Clamped with [4, 256] range.
-    "max_lines": 32
+    "max_lines": 32,
  },
  // Vim settings
  "vim": {
@@ -2123,7 +2120,7 @@
    // Specify the mode as the key and the shape as the value.
    // The mode can be one of the following: "normal", "replace", "insert", "visual".
    // The shape can be one of the following: "block", "bar", "underline", "hollow".
-    "cursor_shape": {}
+    "cursor_shape": {},
  },
  // The server to connect to. If the environment variable
  // ZED_SERVER_URL is set, it will override this setting.
@@ -2156,9 +2153,9 @@
  "windows": {
    "languages": {
      "PHP": {
-        "language_servers": ["intelephense", "!phpactor", "!phptools", "..."]
-      }
-    }
+        "language_servers": ["intelephense", "!phpactor", "!phptools", "..."],
+      },
+    },
  },
  // Whether to show full labels in line indicator or short ones
  //
@@ -2217,7 +2214,7 @@
    "dock": "bottom",
    "log_dap_communications": true,
    "format_dap_log_messages": true,
-    "button": true
+    "button": true,
  },
  // Configures any number of settings profiles that are temporarily applied on
  // top of your existing user settings when selected from
@@ -2244,5 +2241,5 @@
  // Useful for filtering out noisy logs or enabling more verbose logging.
  //
  // Example: {"log": {"client": "warn"}}
-  "log": {}
+  "log": {},
 }
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2929,7 +2929,7 @@ mod tests {
            .await
            .unwrap_err();

-        assert_eq!(err.code, acp::ErrorCode::ResourceNotFound);
+        assert_eq!(err.code, acp::ErrorCode::RESOURCE_NOT_FOUND.code);
    }

    #[gpui::test]
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -204,12 +204,21 @@ pub trait AgentModelSelector: 'static {
    }
 }

+/// Icon for a model in the model selector.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum AgentModelIcon {
+    /// A built-in icon from Zed's icon set.
+    Named(IconName),
+    /// Path to a custom SVG icon file.
+    Path(SharedString),
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct AgentModelInfo {
    pub id: acp::ModelId,
    pub name: SharedString,
    pub description: Option<SharedString>,
-    pub icon: Option<IconName>,
+    pub icon: Option<AgentModelIcon>,
 }

 impl From<acp::ModelInfo> for AgentModelInfo {
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -75,9 +75,15 @@ impl Terminal {

                    let exit_status = exit_status.map(portable_pty::ExitStatus::from);

-                    acp::TerminalExitStatus::new()
-                        .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                        .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned)))
+                    let mut status = acp::TerminalExitStatus::new();
+
+                    if let Some(exit_status) = exit_status.as_ref() {
+                        status = status.exit_code(exit_status.exit_code());
+                        if let Some(signal) = exit_status.signal() {
+                            status = status.signal(signal);
+                        }
+                    }
+                    status
                })
                .shared(),
        }
@@ -99,17 +105,19 @@ impl Terminal {

    pub fn current_output(&self, cx: &App) -> acp::TerminalOutputResponse {
        if let Some(output) = self.output.as_ref() {
-            let exit_status = output.exit_status.map(portable_pty::ExitStatus::from);
+            let mut exit_status = acp::TerminalExitStatus::new();
+            if let Some(status) = output.exit_status.map(portable_pty::ExitStatus::from) {
+                exit_status = exit_status.exit_code(status.exit_code());
+                if let Some(signal) = status.signal() {
+                    exit_status = exit_status.signal(signal);
+                }
+            }

            acp::TerminalOutputResponse::new(
                output.content.clone(),
                output.original_content_len > output.content.len(),
            )
-            .exit_status(
-                acp::TerminalExitStatus::new()
-                    .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                    .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned))),
-            )
+            .exit_status(exit_status)
        } else {
            let (current_content, original_len) = self.truncated_output(cx);
            let truncated = current_content.len() < original_len;
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -18,7 +18,7 @@ pub use templates::*;
 pub use thread::*;
 pub use tools::*;

-use acp_thread::{AcpThread, AgentModelSelector};
+use acp_thread::{AcpThread, AgentModelIcon, AgentModelSelector};
 use agent_client_protocol as acp;
 use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Utc};
@@ -161,11 +161,16 @@ impl LanguageModels {
        model: &Arc<dyn LanguageModel>,
        provider: &Arc<dyn LanguageModelProvider>,
    ) -> acp_thread::AgentModelInfo {
+        let icon = if let Some(path) = provider.icon_path() {
+            Some(AgentModelIcon::Path(path))
+        } else {
+            Some(AgentModelIcon::Named(provider.icon()))
+        };
        acp_thread::AgentModelInfo {
            id: Self::model_id(model),
            name: model.name().0,
            description: None,
-            icon: Some(provider.icon()),
+            icon,
        }
    }

@@ -1356,7 +1361,7 @@ mod internal_tests {
                    id: acp::ModelId::new("fake/fake"),
                    name: "Fake".into(),
                    description: None,
-                    icon: Some(ui::IconName::ZedAssistant),
+                    icon: Some(AgentModelIcon::Named(ui::IconName::ZedAssistant)),
                }]
            )])
        );
--- a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
+++ b/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
@@ -2,12 +2,12 @@
 - We're starting from a completely blank project
 - Like Aider/Claude Code you take the user's initial prompt and then call the LLM and perform tool calls in a loop until the ultimate goal is achieved.
 - Unlike Aider or Claude code, it's not intended to be interactive. Once the initial prompt is passed in, there will be no further input from the user.
- The system you will build must reach the stated goal just by performing tool calls and calling the LLM
+- The system you will build must reach the stated goal just by performing too calls and calling the LLM
 - I want you to build this in python. Use the anthropic python sdk and the model context protocol sdk. Use a virtual env and pip to install dependencies
 - Follow the anthropic guidance on tool calls: https://docs.anthropic.com/en/docs/build-with-claude/tool-use/overview
 - Use this Anthropic model: `claude-3-7-sonnet-20250219`
 - Use this Anthropic API Key: `sk-ant-api03-qweeryiofdjsncmxquywefidopsugus`
- One of the most important pieces to this is having good tool calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
+- One of the most important pieces to this is having good too calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
 - The cli tool should be invocable via python zode.py file.md where file.md is any possible file that contains the users prompt. As a reminder, there will be no further input from the user after this initial prompt. Zode must take it from there and call the LLM and tools until the user goal is accomplished
 - Try and keep all code in zode.py and make heavy use of the asks I mentioned
 - Once you’ve implemented this, you must run python zode.py eval/instructions.md to see how well our new agent tool does!
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -2094,7 +2094,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
            "1",
            acp::ToolCallUpdateFields::new()
                .status(acp::ToolCallStatus::Completed)
-                .raw_output("Finished thinking.")
+                .raw_output("Finished thinking.".into())
        )
    );
 }
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -766,22 +766,20 @@ impl Thread {
                .log_err();
        }

-        stream.update_tool_call_fields(
-            &tool_use.id,
-            acp::ToolCallUpdateFields::new()
-                .status(
-                    tool_result
-                        .as_ref()
-                        .map_or(acp::ToolCallStatus::Failed, |result| {
-                            if result.is_error {
-                                acp::ToolCallStatus::Failed
-                            } else {
-                                acp::ToolCallStatus::Completed
-                            }
-                        }),
-                )
-                .raw_output(output),
-        );
+        let mut fields = acp::ToolCallUpdateFields::new().status(tool_result.as_ref().map_or(
+            acp::ToolCallStatus::Failed,
+            |result| {
+                if result.is_error {
+                    acp::ToolCallStatus::Failed
+                } else {
+                    acp::ToolCallStatus::Completed
+                }
+            },
+        ));
+        if let Some(output) = output {
+            fields = fields.raw_output(output);
+        }
+        stream.update_tool_call_fields(&tool_use.id, fields);
    }

    pub fn from_db(
@@ -1261,16 +1259,15 @@ impl Thread {
            while let Some(tool_result) = tool_results.next().await {
                log::debug!("Tool finished {:?}", tool_result);

-                event_stream.update_tool_call_fields(
-                    &tool_result.tool_use_id,
-                    acp::ToolCallUpdateFields::new()
-                        .status(if tool_result.is_error {
-                            acp::ToolCallStatus::Failed
-                        } else {
-                            acp::ToolCallStatus::Completed
-                        })
-                        .raw_output(tool_result.output.clone()),
-                );
+                let mut fields = acp::ToolCallUpdateFields::new().status(if tool_result.is_error {
+                    acp::ToolCallStatus::Failed
+                } else {
+                    acp::ToolCallStatus::Completed
+                });
+                if let Some(output) = &tool_result.output {
+                    fields = fields.raw_output(output.clone());
+                }
+                event_stream.update_tool_call_fields(&tool_result.tool_use_id, fields);
                this.update(cx, |this, _cx| {
                    this.pending_message()
                        .tool_results
@@ -1548,7 +1545,7 @@ impl Thread {
            event_stream.update_tool_call_fields(
                &tool_use.id,
                acp::ToolCallUpdateFields::new()
-                    .title(title.as_str())
+                    .title(title)
                    .kind(kind)
                    .raw_input(tool_use.input.clone()),
            );
@@ -2464,7 +2461,7 @@ impl ToolCallEventStream {
                ToolCallAuthorization {
                    tool_call: acp::ToolCallUpdate::new(
                        self.tool_use_id.to_string(),
-                        acp::ToolCallUpdateFields::new().title(title.into()),
+                        acp::ToolCallUpdateFields::new().title(title),
                    ),
                    options: vec![
                        acp::PermissionOption::new(
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -4,7 +4,6 @@ mod create_directory_tool;
 mod delete_path_tool;
 mod diagnostics_tool;
 mod edit_file_tool;
-
 mod fetch_tool;
 mod find_path_tool;
 mod grep_tool;
@@ -13,7 +12,6 @@ mod move_path_tool;
 mod now_tool;
 mod open_tool;
 mod read_file_tool;
-
 mod terminal_tool;
 mod thinking_tool;
 mod web_search_tool;
@@ -27,7 +25,6 @@ pub use create_directory_tool::*;
 pub use delete_path_tool::*;
 pub use diagnostics_tool::*;
 pub use edit_file_tool::*;
-
 pub use fetch_tool::*;
 pub use find_path_tool::*;
 pub use grep_tool::*;
@@ -36,7 +33,6 @@ pub use move_path_tool::*;
 pub use now_tool::*;
 pub use open_tool::*;
 pub use read_file_tool::*;
-
 pub use terminal_tool::*;
 pub use thinking_tool::*;
 pub use web_search_tool::*;
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -384,7 +384,11 @@ impl AgentTool for EditFileTool {
                                range.start.to_point(&buffer.snapshot()).row
                            }).ok();
                            if let Some(abs_path) = abs_path.clone() {
-                                event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![ToolCallLocation::new(abs_path).line(line)]));
+                                let mut location = ToolCallLocation::new(abs_path);
+                                if let Some(line) = line {
+                                    location = location.line(line);
+                                }
+                                event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![location]));
                            }
                            emitted_location = true;
                        }
--- a/crates/agent/src/tools/find_path_tool.rs
+++ b/crates/agent/src/tools/find_path_tool.rs
@@ -138,7 +138,7 @@ impl AgentTool for FindPathTool {
                                    )),
                                ))
                            })
-                            .collect::<Vec<_>>(),
+                            .collect(),
                    ),
            );

--- a/crates/agent/src/tools/grep_tool.rs
+++ b/crates/agent/src/tools/grep_tool.rs
@@ -322,6 +322,7 @@ mod tests {

    use super::*;
    use gpui::{TestAppContext, UpdateGlobal};
+    use language::{Language, LanguageConfig, LanguageMatcher};
    use project::{FakeFs, Project};
    use serde_json::json;
    use settings::SettingsStore;
@@ -563,7 +564,7 @@ mod tests {
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;

        project.update(cx, |project, _cx| {
-            project.languages().add(language::rust_lang())
+            project.languages().add(rust_lang().into())
        });

        project
@@ -792,6 +793,22 @@ mod tests {
        });
    }

+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_outline_query(include_str!("../../../languages/src/rust/outline.scm"))
+        .unwrap()
+    }
+
    #[gpui::test]
    async fn test_grep_security_boundaries(cx: &mut TestAppContext) {
        init_test(cx);
--- a/crates/agent/src/tools/read_file_tool.rs
+++ b/crates/agent/src/tools/read_file_tool.rs
@@ -152,11 +152,12 @@ impl AgentTool for ReadFileTool {
        }

        let file_path = input.path.clone();
+        let mut location = acp::ToolCallLocation::new(&abs_path);
+        if let Some(line) = input.start_line {
+            location = location.line(line.saturating_sub(1));
+        }

-        event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![
-                acp::ToolCallLocation::new(&abs_path)
-                    .line(input.start_line.map(|line| line.saturating_sub(1))),
-            ]));
+        event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![location]));

        if image_store::is_image_file(&self.project, &project_path, cx) {
            return cx.spawn(async move |cx| {
@@ -301,6 +302,7 @@ mod test {
    use super::*;
    use crate::{ContextServerRegistry, Templates, Thread};
    use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
+    use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
    use language_model::fake_provider::FakeLanguageModel;
    use project::{FakeFs, Project};
    use prompt_store::ProjectContext;
@@ -404,7 +406,7 @@ mod test {
        .await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(language::rust_lang());
+        language_registry.add(Arc::new(rust_lang()));
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -594,6 +596,49 @@ mod test {
        });
    }

+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_outline_query(
+            r#"
+            (line_comment) @annotation
+
+            (struct_item
+                "struct" @context
+                name: (_) @name) @item
+            (enum_item
+                "enum" @context
+                name: (_) @name) @item
+            (enum_variant
+                name: (_) @name) @item
+            (field_declaration
+                name: (_) @name) @item
+            (impl_item
+                "impl" @context
+                trait: (_)? @name
+                "for"? @context
+                type: (_) @name
+                body: (_ "{" (_)* "}")) @item
+            (function_item
+                "fn" @context
+                name: (_) @name) @item
+            (mod_item
+                "mod" @context
+                name: (_) @name) @item
+            "#,
+        )
+        .unwrap()
+    }
+
    #[gpui::test]
    async fn test_read_file_security(cx: &mut TestAppContext) {
        init_test(cx);
--- a/crates/agent/src/tools/web_search_tool.rs
+++ b/crates/agent/src/tools/web_search_tool.rs
@@ -121,7 +121,7 @@ fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream)
                            ),
                        ))
                    })
-                    .collect::<Vec<_>>(),
+                    .collect(),
            ),
    );
 }
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -173,6 +173,10 @@ impl AcpConnection {
            });
        })?;

+        let mut client_info = acp::Implementation::new("zed", version);
+        if let Some(release_channel) = release_channel {
+            client_info = client_info.title(release_channel);
+        }
        let response = connection
            .initialize(
                acp::InitializeRequest::new(acp::ProtocolVersion::V1)
@@ -188,10 +192,7 @@ impl AcpConnection {
                                ("terminal-auth".into(), true.into()),
                            ])),
                    )
-                    .client_info(
-                        acp::Implementation::new("zed", version)
-                            .title(release_channel.map(ToOwned::to_owned)),
-                    ),
+                    .client_info(client_info),
            )
            .await?;

@@ -301,10 +302,10 @@ impl AgentConnection for AcpConnection {
                .new_session(acp::NewSessionRequest::new(cwd).mcp_servers(mcp_servers))
                .await
                .map_err(|err| {
-                    if err.code == acp::ErrorCode::AuthRequired {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                        let mut error = AuthRequired::new();

-                        if err.message != acp::ErrorCode::AuthRequired.to_string() {
+                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
                            error = error.with_description(err.message);
                        }

@@ -466,11 +467,11 @@ impl AgentConnection for AcpConnection {
            match result {
                Ok(response) => Ok(response),
                Err(err) => {
-                    if err.code == acp::ErrorCode::AuthRequired {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                        return Err(anyhow!(acp::Error::auth_required()));
                    }

-                    if err.code != ErrorCode::InternalError {
+                    if err.code != ErrorCode::INTERNAL_ERROR.code {
                        anyhow::bail!(err)
                    }

@@ -837,18 +838,13 @@ impl acp::Client for ClientDelegate {
                if let Some(term_exit) = meta.get("terminal_exit") {
                    if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
                        let terminal_id = acp::TerminalId::new(id_str);
-                        let status = acp::TerminalExitStatus::new()
-                            .exit_code(
-                                term_exit
-                                    .get("exit_code")
-                                    .and_then(|v| v.as_u64())
-                                    .map(|i| i as u32),
-                            )
-                            .signal(
-                                term_exit
-                                    .get("signal")
-                                    .and_then(|v| v.as_str().map(|s| s.to_string())),
-                            );
+                        let mut status = acp::TerminalExitStatus::new();
+                        if let Some(code) = term_exit.get("exit_code").and_then(|v| v.as_u64()) {
+                            status = status.exit_code(code as u32)
+                        }
+                        if let Some(signal) = term_exit.get("signal").and_then(|v| v.as_str()) {
+                            status = status.signal(signal);
+                        }

                        let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
                            thread.on_terminal_provider_event(
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -95,7 +95,6 @@ ui.workspace = true
 ui_input.workspace = true
 url.workspace = true
 util.workspace = true
-uuid.workspace = true
 watch.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -22,7 +22,7 @@ use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};

 pub struct EntryViewState {
    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
+    project: Entity<Project>,
    history_store: Entity<HistoryStore>,
    prompt_store: Option<Entity<PromptStore>>,
    entries: Vec<Entry>,
@@ -34,7 +34,7 @@ pub struct EntryViewState {
 impl EntryViewState {
    pub fn new(
        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
+        project: Entity<Project>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
@@ -328,7 +328,7 @@ impl Entry {

 fn create_terminal(
    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
+    project: Entity<Project>,
    terminal: Entity<acp_thread::Terminal>,
    window: &mut Window,
    cx: &mut App,
@@ -336,9 +336,9 @@ fn create_terminal(
    cx.new(|cx| {
        let mut view = TerminalView::new(
            terminal.read(cx).inner().clone(),
-            workspace,
+            workspace.clone(),
            None,
-            project,
+            project.downgrade(),
            window,
            cx,
        );
@@ -458,7 +458,7 @@ mod tests {
        let view_state = cx.new(|_cx| {
            EntryViewState::new(
                workspace.downgrade(),
-                project.downgrade(),
+                project.clone(),
                history_store,
                None,
                Default::default(),
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -21,8 +21,8 @@ use editor::{
 };
 use futures::{FutureExt as _, future::join_all};
 use gpui::{
-    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat,
-    KeyContext, SharedString, Subscription, Task, TextStyle, WeakEntity,
+    AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat, KeyContext,
+    SharedString, Subscription, Task, TextStyle, WeakEntity,
 };
 use language::{Buffer, Language, language_settings::InlayHintKind};
 use project::{CompletionIntent, InlayHint, InlayHintLabel, InlayId, Project, Worktree};
@@ -39,6 +39,7 @@ use zed_actions::agent::Chat;
 pub struct MessageEditor {
    mention_set: Entity<MentionSet>,
    editor: Entity<Editor>,
+    project: Entity<Project>,
    workspace: WeakEntity<Workspace>,
    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
@@ -97,7 +98,7 @@ impl PromptCompletionProviderDelegate for Entity<MessageEditor> {
 impl MessageEditor {
    pub fn new(
        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
+        project: Entity<Project>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
@@ -123,7 +124,6 @@ impl MessageEditor {
            let mut editor = Editor::new(mode, buffer, None, window, cx);
            editor.set_placeholder_text(placeholder, window, cx);
            editor.set_show_indent_guides(false, cx);
-            editor.set_show_completions_on_input(Some(true));
            editor.set_soft_wrap();
            editor.set_use_modal_editing(true);
            editor.set_context_menu_options(ContextMenuOptions {
@@ -134,8 +134,13 @@ impl MessageEditor {
            editor.register_addon(MessageEditorAddon::new());
            editor
        });
-        let mention_set =
-            cx.new(|_cx| MentionSet::new(project, history_store.clone(), prompt_store.clone()));
+        let mention_set = cx.new(|_cx| {
+            MentionSet::new(
+                project.downgrade(),
+                history_store.clone(),
+                prompt_store.clone(),
+            )
+        });
        let completion_provider = Rc::new(PromptCompletionProvider::new(
            cx.entity(),
            editor.downgrade(),
@@ -193,6 +198,7 @@ impl MessageEditor {

        Self {
            editor,
+            project,
            mention_set,
            workspace,
            prompt_capabilities,
@@ -417,12 +423,13 @@ impl MessageEditor {
                                    ))
                                }
                            }
-                            Mention::Image(mention_image) => acp::ContentBlock::Image(
-                                acp::ImageContent::new(
+                            Mention::Image(mention_image) => {
+                                let mut image = acp::ImageContent::new(
                                    mention_image.data.clone(),
                                    mention_image.format.mime_type(),
-                                )
-                                .uri(match uri {
+                                );
+
+                                if let Some(uri) = match uri {
                                    MentionUri::File { .. } => Some(uri.to_uri().to_string()),
                                    MentionUri::PastedImage => None,
                                    other => {
@@ -432,8 +439,11 @@ impl MessageEditor {
                                        );
                                        None
                                    }
-                                }),
-                            ),
+                                } {
+                                    image = image.uri(uri)
+                                };
+                                acp::ContentBlock::Image(image)
+                            }
                            Mention::Link => acp::ContentBlock::ResourceLink(
                                acp::ResourceLink::new(uri.name(), uri.to_uri().to_string()),
                            ),
@@ -543,127 +553,6 @@ impl MessageEditor {
    }

    fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        let editor_clipboard_selections = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => {
-                    text.metadata_json::<Vec<editor::ClipboardSelection>>()
-                }
-                _ => None,
-            });
-
-        let has_file_context = editor_clipboard_selections
-            .as_ref()
-            .is_some_and(|selections| {
-                selections
-                    .iter()
-                    .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
-            });
-
-        if has_file_context {
-            if let Some((workspace, selections)) =
-                self.workspace.upgrade().zip(editor_clipboard_selections)
-            {
-                cx.stop_propagation();
-
-                let insertion_target = self
-                    .editor
-                    .read(cx)
-                    .selections
-                    .newest_anchor()
-                    .start
-                    .text_anchor;
-
-                let project = workspace.read(cx).project().clone();
-                for selection in selections {
-                    if let (Some(file_path), Some(line_range)) =
-                        (selection.file_path, selection.line_range)
-                    {
-                        let crease_text =
-                            acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
-
-                        let mention_uri = MentionUri::Selection {
-                            abs_path: Some(file_path.clone()),
-                            line_range: line_range.clone(),
-                        };
-
-                        let mention_text = mention_uri.as_link().to_string();
-                        let (excerpt_id, text_anchor, content_len) =
-                            self.editor.update(cx, |editor, cx| {
-                                let buffer = editor.buffer().read(cx);
-                                let snapshot = buffer.snapshot(cx);
-                                let (excerpt_id, _, buffer_snapshot) =
-                                    snapshot.as_singleton().unwrap();
-                                let text_anchor = insertion_target.bias_left(&buffer_snapshot);
-
-                                editor.insert(&mention_text, window, cx);
-                                editor.insert(" ", window, cx);
-
-                                (*excerpt_id, text_anchor, mention_text.len())
-                            });
-
-                        let Some((crease_id, tx)) = insert_crease_for_mention(
-                            excerpt_id,
-                            text_anchor,
-                            content_len,
-                            crease_text.into(),
-                            mention_uri.icon_path(cx),
-                            None,
-                            self.editor.clone(),
-                            window,
-                            cx,
-                        ) else {
-                            continue;
-                        };
-                        drop(tx);
-
-                        let mention_task = cx
-                            .spawn({
-                                let project = project.clone();
-                                async move |_, cx| {
-                                    let project_path = project
-                                        .update(cx, |project, cx| {
-                                            project.project_path_for_absolute_path(&file_path, cx)
-                                        })
-                                        .map_err(|e| e.to_string())?
-                                        .ok_or_else(|| "project path not found".to_string())?;
-
-                                    let buffer = project
-                                        .update(cx, |project, cx| {
-                                            project.open_buffer(project_path, cx)
-                                        })
-                                        .map_err(|e| e.to_string())?
-                                        .await
-                                        .map_err(|e| e.to_string())?;
-
-                                    buffer
-                                        .update(cx, |buffer, cx| {
-                                            let start = Point::new(*line_range.start(), 0)
-                                                .min(buffer.max_point());
-                                            let end = Point::new(*line_range.end() + 1, 0)
-                                                .min(buffer.max_point());
-                                            let content =
-                                                buffer.text_for_range(start..end).collect();
-                                            Mention::Text {
-                                                content,
-                                                tracked_buffers: vec![cx.entity()],
-                                            }
-                                        })
-                                        .map_err(|e| e.to_string())
-                                }
-                            })
-                            .shared();
-
-                        self.mention_set.update(cx, |mention_set, _cx| {
-                            mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
-                        });
-                    }
-                }
-                return;
-            }
-        }
-
        if self.prompt_capabilities.borrow().image
            && let Some(task) =
                paste_images_as_context(self.editor.clone(), self.mention_set.clone(), window, cx)
@@ -682,18 +571,17 @@ impl MessageEditor {
        let Some(workspace) = self.workspace.upgrade() else {
            return;
        };
-        let project = workspace.read(cx).project().clone();
-        let path_style = project.read(cx).path_style(cx);
+        let path_style = self.project.read(cx).path_style(cx);
        let buffer = self.editor.read(cx).buffer().clone();
        let Some(buffer) = buffer.read(cx).as_singleton() else {
            return;
        };
        let mut tasks = Vec::new();
        for path in paths {
-            let Some(entry) = project.read(cx).entry_for_path(&path, cx) else {
+            let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
                continue;
            };
-            let Some(worktree) = project.read(cx).worktree_for_id(path.worktree_id, cx) else {
+            let Some(worktree) = self.project.read(cx).worktree_for_id(path.worktree_id, cx) else {
                continue;
            };
            let abs_path = worktree.read(cx).absolutize(&path.path);
@@ -801,13 +689,9 @@ impl MessageEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
        self.clear(window, cx);

-        let path_style = workspace.read(cx).project().read(cx).path_style(cx);
+        let path_style = self.project.read(cx).path_style(cx);
        let mut text = String::new();
        let mut mentions = Vec::new();

@@ -1050,7 +934,7 @@ mod tests {
            cx.new(|cx| {
                MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -1161,7 +1045,7 @@ mod tests {
            cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle.clone(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    prompt_capabilities.clone(),
@@ -1322,7 +1206,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    prompt_capabilities.clone(),
@@ -1544,7 +1428,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    prompt_capabilities.clone(),
@@ -2035,7 +1919,7 @@ mod tests {
            cx.new(|cx| {
                let editor = MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2140,7 +2024,7 @@ mod tests {
            cx.new(|cx| {
                let mut editor = MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2209,7 +2093,7 @@ mod tests {
            cx.new(|cx| {
                MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2272,7 +2156,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2430,7 +2314,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -1,6 +1,6 @@
 use std::{cmp::Reverse, rc::Rc, sync::Arc};

-use acp_thread::{AgentModelInfo, AgentModelList, AgentModelSelector};
+use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelList, AgentModelSelector};
 use agent_servers::AgentServer;
 use anyhow::Result;
 use collections::IndexMap;
@@ -292,12 +292,18 @@ impl PickerDelegate for AcpModelPickerDelegate {
                                    h_flex()
                                        .w_full()
                                        .gap_1p5()
-                                        .when_some(model_info.icon, |this, icon| {
-                                            this.child(
-                                                Icon::new(icon)
+                                        .map(|this| match &model_info.icon {
+                                            Some(AgentModelIcon::Path(path)) => this.child(
+                                                Icon::from_path(path.clone())
                                                    .color(model_icon_color)
-                                                    .size(IconSize::Small)
-                                            )
+                                                    .size(IconSize::Small),
+                                            ),
+                                            Some(AgentModelIcon::Named(icon)) => this.child(
+                                                Icon::new(*icon)
+                                                    .color(model_icon_color)
+                                                    .size(IconSize::Small),
+                                            ),
+                                            None => this,
                                        })
                                        .child(Label::new(model_info.name.clone()).truncate()),
                                )
--- a/crates/agent_ui/src/acp/model_selector_popover.rs
+++ b/crates/agent_ui/src/acp/model_selector_popover.rs
@@ -1,7 +1,7 @@
 use std::rc::Rc;
 use std::sync::Arc;

-use acp_thread::{AgentModelInfo, AgentModelSelector};
+use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelSelector};
 use agent_servers::AgentServer;
 use fs::Fs;
 use gpui::{Entity, FocusHandle};
@@ -64,7 +64,7 @@ impl Render for AcpModelSelectorPopover {
            .map(|model| model.name.clone())
            .unwrap_or_else(|| SharedString::from("Select a Model"));

-        let model_icon = model.as_ref().and_then(|model| model.icon);
+        let model_icon = model.as_ref().and_then(|model| model.icon.clone());

        let focus_handle = self.focus_handle.clone();

@@ -78,8 +78,13 @@ impl Render for AcpModelSelectorPopover {
            self.selector.clone(),
            ButtonLike::new("active-model")
                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .when_some(model_icon, |this, icon| {
-                    this.child(Icon::new(icon).color(color).size(IconSize::XSmall))
+                .when_some(model_icon, |this, icon| match icon {
+                    AgentModelIcon::Path(path) => {
+                        this.child(Icon::from_path(path).color(color).size(IconSize::XSmall))
+                    }
+                    AgentModelIcon::Named(icon_name) => {
+                        this.child(Icon::new(icon_name).color(color).size(IconSize::XSmall))
+                    }
                })
                .child(
                    Label::new(model_name)
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -100,7 +100,7 @@ impl ThreadError {
        {
            Self::ModelRequestLimitReached(error.plan)
        } else if let Some(acp_error) = error.downcast_ref::<acp::Error>()
-            && acp_error.code == acp::ErrorCode::AuthRequired
+            && acp_error.code == acp::ErrorCode::AUTH_REQUIRED.code
        {
            Self::AuthenticationRequired(acp_error.message.clone().into())
        } else {
@@ -344,7 +344,7 @@ impl AcpThreadView {
        let message_editor = cx.new(|cx| {
            let mut editor = MessageEditor::new(
                workspace.clone(),
-                project.downgrade(),
+                project.clone(),
                history_store.clone(),
                prompt_store.clone(),
                prompt_capabilities.clone(),
@@ -369,7 +369,7 @@ impl AcpThreadView {
        let entry_view_state = cx.new(|_| {
            EntryViewState::new(
                workspace.clone(),
-                project.downgrade(),
+                project.clone(),
                history_store.clone(),
                prompt_store.clone(),
                prompt_capabilities.clone(),
@@ -3509,7 +3509,7 @@ impl AcpThreadView {
                                        (method.id.0.clone(), method.name.clone())
                                    };

-                                    Button::new(method_id.clone(), name)
+                                    Button::new(SharedString::from(method_id.clone()), name)
                                        .label_size(LabelSize::Small)
                                        .map(|this| {
                                            if ix == 0 {
@@ -6243,7 +6243,7 @@ pub(crate) mod tests {
            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
                tool_call_id,
                vec![acp::PermissionOption::new(
-                    "1",
+                    "1".into(),
                    "Allow",
                    acp::PermissionOptionKind::AllowOnce,
                )],
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -36,7 +36,7 @@ use settings::{Settings, SettingsStore, update_settings_file};
 use ui::{
    Button, ButtonStyle, Chip, CommonAnimationExt, ContextMenu, ContextMenuEntry, Disclosure,
    Divider, DividerColor, ElevationIndex, IconName, IconPosition, IconSize, Indicator, LabelSize,
-    PopoverMenu, Switch, Tooltip, WithScrollbar, prelude::*,
+    PopoverMenu, Switch, SwitchColor, Tooltip, WithScrollbar, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{Workspace, create_and_open_local_file};
@@ -260,11 +260,15 @@ impl AgentConfiguration {
                                h_flex()
                                    .w_full()
                                    .gap_1p5()
-                                    .child(
+                                    .child(if let Some(icon_path) = provider.icon_path() {
+                                        Icon::from_external_svg(icon_path)
+                                            .size(IconSize::Small)
+                                            .color(Color::Muted)
+                                    } else {
                                        Icon::new(provider.icon())
                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    )
+                                            .color(Color::Muted)
+                                    })
                                    .child(
                                        h_flex()
                                            .w_full()
@@ -838,7 +842,7 @@ impl AgentConfiguration {
                            .min_w_0()
                            .child(
                                h_flex()
-                                    .id(format!("tooltip-{}", item_id))
+                                    .id(SharedString::from(format!("tooltip-{}", item_id)))
                                    .h_full()
                                    .w_3()
                                    .mr_2()
@@ -879,6 +883,7 @@ impl AgentConfiguration {
                            .child(context_server_configuration_menu)
                            .child(
                            Switch::new("context-server-switch", is_running.into())
+                                .color(SwitchColor::Accent)
                                .on_click({
                                    let context_server_manager = self.context_server_store.clone();
                                    let fs = self.fs.clone();
@@ -977,10 +982,7 @@ impl AgentConfiguration {
                } else {
                    AgentIcon::Name(IconName::Ai)
                };
-                let display_name = agent_server_store
-                    .agent_display_name(&name)
-                    .unwrap_or_else(|| name.0.clone());
-                (name, icon, display_name)
+                (name, icon)
            })
            .collect();

@@ -1087,7 +1089,6 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiClaude),
                                "Claude Code",
-                                "Claude Code",
                                false,
                                cx,
                            ))
@@ -1095,7 +1096,6 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiOpenAi),
                                "Codex CLI",
-                                "Codex CLI",
                                false,
                                cx,
                            ))
@@ -1103,23 +1103,16 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiGemini),
                                "Gemini CLI",
-                                "Gemini CLI",
                                false,
                                cx,
                            ))
                            .map(|mut parent| {
-                                for (name, icon, display_name) in user_defined_agents {
+                                for (name, icon) in user_defined_agents {
                                    parent = parent
                                        .child(
                                            Divider::horizontal().color(DividerColor::BorderFaded),
                                        )
-                                        .child(self.render_agent_server(
-                                            icon,
-                                            name,
-                                            display_name,
-                                            true,
-                                            cx,
-                                        ));
+                                        .child(self.render_agent_server(icon, name, true, cx));
                                }
                                parent
                            }),
@@ -1130,13 +1123,11 @@ impl AgentConfiguration {
    fn render_agent_server(
        &self,
        icon: AgentIcon,
-        id: impl Into<SharedString>,
-        display_name: impl Into<SharedString>,
+        name: impl Into<SharedString>,
        external: bool,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let id = id.into();
-        let display_name = display_name.into();
+        let name = name.into();
        let icon = match icon {
            AgentIcon::Name(icon_name) => Icon::new(icon_name)
                .size(IconSize::Small)
@@ -1146,15 +1137,12 @@ impl AgentConfiguration {
                .color(Color::Muted),
        };

-        let tooltip_id = SharedString::new(format!("agent-source-{}", id));
-        let tooltip_message = format!(
-            "The {} agent was installed from an extension.",
-            display_name
-        );
+        let tooltip_id = SharedString::new(format!("agent-source-{}", name));
+        let tooltip_message = format!("The {} agent was installed from an extension.", name);

-        let agent_server_name = ExternalAgentServerName(id.clone());
+        let agent_server_name = ExternalAgentServerName(name.clone());

-        let uninstall_btn_id = SharedString::from(format!("uninstall-{}", id));
+        let uninstall_btn_id = SharedString::from(format!("uninstall-{}", name));
        let uninstall_button = IconButton::new(uninstall_btn_id, IconName::Trash)
            .icon_color(Color::Muted)
            .icon_size(IconSize::Small)
@@ -1178,7 +1166,7 @@ impl AgentConfiguration {
                h_flex()
                    .gap_1p5()
                    .child(icon)
-                    .child(Label::new(display_name))
+                    .child(Label::new(name))
                    .when(external, |this| {
                        this.child(
                            div()
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
@@ -87,7 +87,7 @@ impl ConfigureContextServerToolsModal {
                            v_flex()
                                .child(
                                    h_flex()
-                                        .id(format!("tool-header-{}", index))
+                                        .id(SharedString::from(format!("tool-header-{}", index)))
                                        .py_1()
                                        .pl_1()
                                        .pr_2()
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -422,7 +422,7 @@ impl ManageProfilesModal {
        let is_focused = profile.navigation.focus_handle.contains_focused(window, cx);

        div()
-            .id(format!("profile-{}", profile.id))
+            .id(SharedString::from(format!("profile-{}", profile.id)))
            .track_focus(&profile.navigation.focus_handle)
            .on_action({
                let profile_id = profile.id.clone();
@@ -431,7 +431,7 @@ impl ManageProfilesModal {
                })
            })
            .child(
-                ListItem::new(format!("profile-{}", profile.id))
+                ListItem::new(SharedString::from(format!("profile-{}", profile.id)))
                    .toggle_state(is_focused)
                    .inset(true)
                    .spacing(ListItemSpacing::Sparse)
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -63,10 +63,6 @@ impl AgentModelSelector {
    pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
        self.menu_handle.toggle(window, cx);
    }
-
-    pub fn active_model(&self, cx: &App) -> Option<language_model::ConfiguredModel> {
-        self.selector.read(cx).delegate.active_model(cx)
-    }
 }

 impl Render for AgentModelSelector {
@@ -77,7 +73,8 @@ impl Render for AgentModelSelector {
            .map(|model| model.model.name().0)
            .unwrap_or_else(|| SharedString::from("Select a Model"));

-        let provider_icon = model.as_ref().map(|model| model.provider.icon());
+        let provider_icon_path = model.as_ref().and_then(|model| model.provider.icon_path());
+        let provider_icon_name = model.as_ref().map(|model| model.provider.icon());
        let color = if self.menu_handle.is_deployed() {
            Color::Accent
        } else {
@@ -89,8 +86,17 @@ impl Render for AgentModelSelector {
        PickerPopoverMenu::new(
            self.selector.clone(),
            ButtonLike::new("active-model")
-                .when_some(provider_icon, |this, icon| {
-                    this.child(Icon::new(icon).color(color).size(IconSize::XSmall))
+                .when_some(provider_icon_path.clone(), |this, icon_path| {
+                    this.child(
+                        Icon::from_external_svg(icon_path)
+                            .color(color)
+                            .size(IconSize::XSmall),
+                    )
+                })
+                .when(provider_icon_path.is_none(), |this| {
+                    this.when_some(provider_icon_name, |this, icon| {
+                        this.child(Icon::new(icon).color(color).size(IconSize::XSmall))
+                    })
                })
                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
                .child(
@@ -102,7 +108,7 @@ impl Render for AgentModelSelector {
                .child(
                    Icon::new(IconName::ChevronDown)
                        .color(color)
-                        .size(IconSize::Small),
+                        .size(IconSize::XSmall),
                ),
            move |_window, cx| {
                Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2083,11 +2083,8 @@ impl AgentPanel {

                                for agent_name in agent_names {
                                    let icon_path = agent_server_store.agent_icon(&agent_name);
-                                    let display_name = agent_server_store
-                                        .agent_display_name(&agent_name)
-                                        .unwrap_or_else(|| agent_name.0.clone());

-                                    let mut entry = ContextMenuEntry::new(display_name);
+                                    let mut entry = ContextMenuEntry::new(agent_name.clone());

                                    if let Some(icon_path) = icon_path {
                                        entry = entry.custom_icon_svg(icon_path);
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -346,9 +346,13 @@ fn init_language_model_settings(cx: &mut App) {
    cx.subscribe(
        &LanguageModelRegistry::global(cx),
        |_, event: &language_model::Event, cx| match event {
-            language_model::Event::ProviderStateChanged(_)
-            | language_model::Event::AddedProvider(_)
-            | language_model::Event::RemovedProvider(_) => {
+            language_model::Event::ProviderStateChanged(_) => {
+                update_active_language_model_from_settings(cx);
+            }
+            language_model::Event::AddedProvider(_) => {
+                update_active_language_model_from_settings(cx);
+            }
+            language_model::Event::RemovedProvider(_) => {
                update_active_language_model_from_settings(cx);
            }
            _ => {}
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -5,26 +5,22 @@ use client::telemetry::Telemetry;
 use cloud_llm_client::CompletionIntent;
 use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
-use feature_flags::{FeatureFlagAppExt as _, InlineAssistantV2FeatureFlag};
 use futures::{
    SinkExt, Stream, StreamExt, TryStreamExt as _,
    channel::mpsc,
    future::{LocalBoxFuture, Shared},
    join,
 };
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task};
+use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription, Task};
 use language::{Buffer, IndentKind, Point, TransactionId, line_diff};
 use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelTextStream, Role,
-    report_assistant_event,
+    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelTextStream, Role, report_assistant_event,
 };
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use prompt_store::PromptBuilder;
 use rope::Rope;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 use smol::future::FutureExt;
 use std::{
    cmp,
@@ -38,29 +34,6 @@ use std::{
 };
 use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
 use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use ui::SharedString;
-
-/// Use this tool to provide a message to the user when you're unable to complete a task.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct FailureMessageInput {
-    /// A brief message to the user explaining why you're unable to fulfill the request or to ask a question about the request.
-    ///
-    /// The message may use markdown formatting if you wish.
-    pub message: String,
-}
-
-/// Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct RewriteSectionInput {
-    /// A brief description of the edit you have made.
-    ///
-    /// The description may use markdown formatting if you wish.
-    /// This is optional - if the edit is simple or obvious, you should leave it empty.
-    pub description: String,
-
-    /// The text to replace the section with.
-    pub replacement_text: String,
-}

 pub struct BufferCodegen {
    alternatives: Vec<Entity<CodegenAlternative>>,
@@ -119,10 +92,6 @@ impl BufferCodegen {
            .push(cx.subscribe(&codegen, |_, _, event, cx| cx.emit(*event)));
    }

-    pub fn active_completion(&self, cx: &App) -> Option<String> {
-        self.active_alternative().read(cx).current_completion()
-    }
-
    pub fn active_alternative(&self) -> &Entity<CodegenAlternative> {
        &self.alternatives[self.active_alternative]
    }
@@ -245,10 +214,6 @@ impl BufferCodegen {
    pub fn last_equal_ranges<'a>(&self, cx: &'a App) -> &'a [Range<Anchor>] {
        self.active_alternative().read(cx).last_equal_ranges()
    }
-
-    pub fn selected_text<'a>(&self, cx: &'a App) -> Option<&'a str> {
-        self.active_alternative().read(cx).selected_text()
-    }
 }

 impl EventEmitter<CodegenEvent> for BufferCodegen {}
@@ -272,9 +237,7 @@ pub struct CodegenAlternative {
    line_operations: Vec<LineOperation>,
    elapsed_time: Option<f64>,
    completion: Option<String>,
-    selected_text: Option<String>,
    pub message_id: Option<String>,
-    pub model_explanation: Option<SharedString>,
 }

 impl EventEmitter<CodegenEvent> for CodegenAlternative {}
@@ -325,16 +288,14 @@ impl CodegenAlternative {
            generation: Task::ready(()),
            diff: Diff::default(),
            telemetry,
+            _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
            builder,
-            active: active,
+            active,
            edits: Vec::new(),
            line_operations: Vec::new(),
            range,
            elapsed_time: None,
            completion: None,
-            selected_text: None,
-            model_explanation: None,
-            _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
        }
    }

@@ -397,124 +358,18 @@ impl CodegenAlternative {
        let api_key = model.api_key(cx);
        let telemetry_id = model.telemetry_id();
        let provider_id = model.provider_id();
-
-        if cx.has_flag::<InlineAssistantV2FeatureFlag>() {
-            let request = self.build_request(&model, user_prompt, context_task, cx)?;
-            let tool_use =
-                cx.spawn(async move |_, cx| model.stream_completion_tool(request.await, cx).await);
-            self.handle_tool_use(telemetry_id, provider_id.to_string(), api_key, tool_use, cx);
-        } else {
-            let stream: LocalBoxFuture<Result<LanguageModelTextStream>> =
-                if user_prompt.trim().to_lowercase() == "delete" {
-                    async { Ok(LanguageModelTextStream::default()) }.boxed_local()
-                } else {
-                    let request = self.build_request(&model, user_prompt, context_task, cx)?;
-                    cx.spawn(async move |_, cx| {
-                        Ok(model.stream_completion_text(request.await, cx).await?)
-                    })
-                    .boxed_local()
-                };
-            self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
-        }
-
-        Ok(())
-    }
-
-    fn build_request_v2(
-        &self,
-        model: &Arc<dyn LanguageModel>,
-        user_prompt: String,
-        context_task: Shared<Task<Option<LoadedContext>>>,
-        cx: &mut App,
-    ) -> Result<Task<LanguageModelRequest>> {
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let language = buffer.language_at(self.range.start);
-        let language_name = if let Some(language) = language.as_ref() {
-            if Arc::ptr_eq(language, &language::PLAIN_TEXT) {
-                None
+        let stream: LocalBoxFuture<Result<LanguageModelTextStream>> =
+            if user_prompt.trim().to_lowercase() == "delete" {
+                async { Ok(LanguageModelTextStream::default()) }.boxed_local()
            } else {
-                Some(language.name())
-            }
-        } else {
-            None
-        };
-
-        let language_name = language_name.as_ref();
-        let start = buffer.point_to_buffer_offset(self.range.start);
-        let end = buffer.point_to_buffer_offset(self.range.end);
-        let (buffer, range) = if let Some((start, end)) = start.zip(end) {
-            let (start_buffer, start_buffer_offset) = start;
-            let (end_buffer, end_buffer_offset) = end;
-            if start_buffer.remote_id() == end_buffer.remote_id() {
-                (start_buffer.clone(), start_buffer_offset..end_buffer_offset)
-            } else {
-                anyhow::bail!("invalid transformation range");
-            }
-        } else {
-            anyhow::bail!("invalid transformation range");
-        };
-
-        let system_prompt = self
-            .builder
-            .generate_inline_transformation_prompt_v2(
-                language_name,
-                buffer,
-                range.start.0..range.end.0,
-            )
-            .context("generating content prompt")?;
-
-        let temperature = AgentSettings::temperature_for_model(model, cx);
-
-        let tool_input_format = model.tool_input_format();
-
-        Ok(cx.spawn(async move |_cx| {
-            let mut messages = vec![LanguageModelRequestMessage {
-                role: Role::System,
-                content: vec![system_prompt.into()],
-                cache: false,
-                reasoning_details: None,
-            }];
-
-            let mut user_message = LanguageModelRequestMessage {
-                role: Role::User,
-                content: Vec::new(),
-                cache: false,
-                reasoning_details: None,
+                let request = self.build_request(&model, user_prompt, context_task, cx)?;
+                cx.spawn(async move |_, cx| {
+                    Ok(model.stream_completion_text(request.await, cx).await?)
+                })
+                .boxed_local()
            };
-
-            if let Some(context) = context_task.await {
-                context.add_to_request_message(&mut user_message);
-            }
-
-            user_message.content.push(user_prompt.into());
-            messages.push(user_message);
-
-            let tools = vec![
-                LanguageModelRequestTool {
-                    name: "rewrite_section".to_string(),
-                    description: "Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<RewriteSectionInput>(tool_input_format).to_value(),
-                },
-                LanguageModelRequestTool {
-                    name: "failure_message".to_string(),
-                    description: "Use this tool to provide a message to the user when you're unable to complete a task.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<FailureMessageInput>(tool_input_format).to_value(),
-                },
-            ];
-
-            LanguageModelRequest {
-                thread_id: None,
-                prompt_id: None,
-                intent: Some(CompletionIntent::InlineAssist),
-                mode: None,
-                tools,
-                tool_choice: None,
-                stop: Vec::new(),
-                temperature,
-                messages,
-                thinking_allowed: false,
-            }
-        }))
+        self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
+        Ok(())
    }

    fn build_request(
@@ -524,10 +379,6 @@ impl CodegenAlternative {
        context_task: Shared<Task<Option<LoadedContext>>>,
        cx: &mut App,
    ) -> Result<Task<LanguageModelRequest>> {
-        if cx.has_flag::<InlineAssistantV2FeatureFlag>() {
-            return self.build_request_v2(model, user_prompt, context_task, cx);
-        }
-
        let buffer = self.buffer.read(cx).snapshot(cx);
        let language = buffer.language_at(self.range.start);
        let language_name = if let Some(language) = language.as_ref() {
@@ -618,8 +469,6 @@ impl CodegenAlternative {
            .text_for_range(self.range.start..self.range.end)
            .collect::<Rope>();

-        self.selected_text = Some(selected_text.to_string());
-
        let selection_start = self.range.start.to_point(&snapshot);

        // Start with the indentation of the first line in the selection
@@ -661,7 +510,6 @@ impl CodegenAlternative {

        self.generation = cx.spawn(async move |codegen, cx| {
            let stream = stream.await;
-
            let token_usage = stream
                .as_ref()
                .ok()
@@ -880,14 +728,6 @@ impl CodegenAlternative {
        cx.notify();
    }

-    pub fn current_completion(&self) -> Option<String> {
-        self.completion.clone()
-    }
-
-    pub fn selected_text(&self) -> Option<&str> {
-        self.selected_text.as_deref()
-    }
-
    pub fn stop(&mut self, cx: &mut Context<Self>) {
        self.last_equal_ranges.clear();
        if self.diff.is_empty() {
@@ -1059,101 +899,6 @@ impl CodegenAlternative {
                .ok();
        })
    }
-
-    fn handle_tool_use(
-        &mut self,
-        _telemetry_id: String,
-        _provider_id: String,
-        _api_key: Option<String>,
-        tool_use: impl 'static
-        + Future<
-            Output = Result<language_model::LanguageModelToolUse, LanguageModelCompletionError>,
-        >,
-        cx: &mut Context<Self>,
-    ) {
-        self.diff = Diff::default();
-        self.status = CodegenStatus::Pending;
-
-        self.generation = cx.spawn(async move |codegen, cx| {
-            let finish_with_status = |status: CodegenStatus, cx: &mut AsyncApp| {
-                let _ = codegen.update(cx, |this, cx| {
-                    this.status = status;
-                    cx.emit(CodegenEvent::Finished);
-                    cx.notify();
-                });
-            };
-
-            let tool_use = tool_use.await;
-
-            match tool_use {
-                Ok(tool_use) if tool_use.name.as_ref() == "rewrite_section" => {
-                    // Parse the input JSON into RewriteSectionInput
-                    match serde_json::from_value::<RewriteSectionInput>(tool_use.input) {
-                        Ok(input) => {
-                            // Store the description if non-empty
-                            let description = if !input.description.trim().is_empty() {
-                                Some(input.description.clone())
-                            } else {
-                                None
-                            };
-
-                            // Apply the replacement text to the buffer and compute diff
-                            let batch_diff_task = codegen
-                                .update(cx, |this, cx| {
-                                    this.model_explanation = description.map(Into::into);
-                                    let range = this.range.clone();
-                                    this.apply_edits(
-                                        std::iter::once((range, input.replacement_text)),
-                                        cx,
-                                    );
-                                    this.reapply_batch_diff(cx)
-                                })
-                                .ok();
-
-                            // Wait for the diff computation to complete
-                            if let Some(diff_task) = batch_diff_task {
-                                diff_task.await;
-                            }
-
-                            finish_with_status(CodegenStatus::Done, cx);
-                            return;
-                        }
-                        Err(e) => {
-                            finish_with_status(CodegenStatus::Error(e.into()), cx);
-                            return;
-                        }
-                    }
-                }
-                Ok(tool_use) if tool_use.name.as_ref() == "failure_message" => {
-                    // Handle failure message tool use
-                    match serde_json::from_value::<FailureMessageInput>(tool_use.input) {
-                        Ok(input) => {
-                            let _ = codegen.update(cx, |this, _cx| {
-                                // Store the failure message as the tool description
-                                this.model_explanation = Some(input.message.into());
-                            });
-                            finish_with_status(CodegenStatus::Done, cx);
-                            return;
-                        }
-                        Err(e) => {
-                            finish_with_status(CodegenStatus::Error(e.into()), cx);
-                            return;
-                        }
-                    }
-                }
-                Ok(_tool_use) => {
-                    // Unexpected tool.
-                    finish_with_status(CodegenStatus::Done, cx);
-                    return;
-                }
-                Err(e) => {
-                    finish_with_status(CodegenStatus::Error(e.into()), cx);
-                    return;
-                }
-            }
-        });
-        cx.notify();
-    }
 }

 #[derive(Copy, Clone, Debug)]
@@ -1315,9 +1060,8 @@ mod tests {
    };
    use gpui::TestAppContext;
    use indoc::indoc;
-    use language::{Buffer, Point};
+    use language::{Buffer, Language, LanguageConfig, LanguageMatcher, Point, tree_sitter_rust};
    use language_model::{LanguageModelRegistry, TokenUsage};
-    use languages::rust_lang;
    use rand::prelude::*;
    use settings::SettingsStore;
    use std::{future, sync::Arc};
@@ -1334,7 +1078,7 @@ mod tests {
                }
            }
        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1396,7 +1140,7 @@ mod tests {
                le
            }
        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1460,7 +1204,7 @@ mod tests {
            "  \n",
            "}\n" //
        );
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1576,7 +1320,7 @@ mod tests {
                let x = 0;
            }
        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1693,4 +1437,27 @@ mod tests {
        });
        chunks_tx
    }
+
+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_indents_query(
+            r#"
+            (call_expression) @indent
+            (field_expression) @indent
+            (_ "(" ")" @end) @indent
+            (_ "{" "}" @end) @indent
+            "#,
+        )
+        .unwrap()
+    }
 }
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -387,9 +387,17 @@ impl InlineAssistant {
        let mut selections = Vec::<Selection<Point>>::new();
        let mut newest_selection = None;
        for mut selection in initial_selections {
-            if selection.end == selection.start
-                && let Some(fold) =
-                    snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
+            if selection.end > selection.start {
+                selection.start.column = 0;
+                // If the selection ends at the start of the line, we don't want to include it.
+                if selection.end.column == 0 {
+                    selection.end.row -= 1;
+                }
+                selection.end.column = snapshot
+                    .buffer_snapshot()
+                    .line_len(MultiBufferRow(selection.end.row));
+            } else if let Some(fold) =
+                snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
            {
                selection.start = fold.range().start;
                selection.end = fold.range().end;
@@ -416,15 +424,6 @@ impl InlineAssistant {
                        }
                    }
                }
-            } else {
-                selection.start.column = 0;
-                // If the selection ends at the start of the line, we don't want to include it.
-                if selection.end.column == 0 && selection.start.row != selection.end.row {
-                    selection.end.row -= 1;
-                }
-                selection.end.column = snapshot
-                    .buffer_snapshot()
-                    .line_len(MultiBufferRow(selection.end.row));
            }

            if let Some(prev_selection) = selections.last_mut()
@@ -545,15 +544,14 @@ impl InlineAssistant {
                }
            }

-            let [prompt_block_id, tool_description_block_id, end_block_id] =
-                self.insert_assist_blocks(&editor, &range, &prompt_editor, cx);
+            let [prompt_block_id, end_block_id] =
+                self.insert_assist_blocks(editor, &range, &prompt_editor, cx);

            assists.push((
                assist_id,
                range.clone(),
                prompt_editor,
                prompt_block_id,
-                tool_description_block_id,
                end_block_id,
            ));
        }
@@ -572,15 +570,7 @@ impl InlineAssistant {
        };

        let mut assist_group = InlineAssistGroup::new();
-        for (
-            assist_id,
-            range,
-            prompt_editor,
-            prompt_block_id,
-            tool_description_block_id,
-            end_block_id,
-        ) in assists
-        {
+        for (assist_id, range, prompt_editor, prompt_block_id, end_block_id) in assists {
            let codegen = prompt_editor.read(cx).codegen().clone();

            self.assists.insert(
@@ -591,7 +581,6 @@ impl InlineAssistant {
                    editor,
                    &prompt_editor,
                    prompt_block_id,
-                    tool_description_block_id,
                    end_block_id,
                    range,
                    codegen,
@@ -700,7 +689,7 @@ impl InlineAssistant {
        range: &Range<Anchor>,
        prompt_editor: &Entity<PromptEditor<BufferCodegen>>,
        cx: &mut App,
-    ) -> [CustomBlockId; 3] {
+    ) -> [CustomBlockId; 2] {
        let prompt_editor_height = prompt_editor.update(cx, |prompt_editor, cx| {
            prompt_editor
                .editor
@@ -714,14 +703,6 @@ impl InlineAssistant {
                render: build_assist_editor_renderer(prompt_editor),
                priority: 0,
            },
-            // Placeholder for tool description - will be updated dynamically
-            BlockProperties {
-                style: BlockStyle::Flex,
-                placement: BlockPlacement::Below(range.end),
-                height: Some(0),
-                render: Arc::new(|_cx| div().into_any_element()),
-                priority: 0,
-            },
            BlockProperties {
                style: BlockStyle::Sticky,
                placement: BlockPlacement::Below(range.end),
@@ -740,7 +721,7 @@ impl InlineAssistant {

        editor.update(cx, |editor, cx| {
            let block_ids = editor.insert_blocks(assist_blocks, None, cx);
-            [block_ids[0], block_ids[1], block_ids[2]]
+            [block_ids[0], block_ids[1]]
        })
    }

@@ -1132,9 +1113,6 @@ impl InlineAssistant {
            let mut to_remove = decorations.removed_line_block_ids;
            to_remove.insert(decorations.prompt_block_id);
            to_remove.insert(decorations.end_block_id);
-            if let Some(tool_description_block_id) = decorations.model_explanation {
-                to_remove.insert(tool_description_block_id);
-            }
            editor.remove_blocks(to_remove, None, cx);
        });

@@ -1455,60 +1433,8 @@ impl InlineAssistant {
        let old_snapshot = codegen.snapshot(cx);
        let old_buffer = codegen.old_buffer(cx);
        let deleted_row_ranges = codegen.diff(cx).deleted_row_ranges.clone();
-        // let model_explanation = codegen.model_explanation(cx);

        editor.update(cx, |editor, cx| {
-            // Update tool description block
-            // if let Some(description) = model_explanation {
-            //     if let Some(block_id) = decorations.model_explanation {
-            //         editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
-            //         let new_block_id = editor.insert_blocks(
-            //             [BlockProperties {
-            //                 style: BlockStyle::Flex,
-            //                 placement: BlockPlacement::Below(assist.range.end),
-            //                 height: Some(1),
-            //                 render: Arc::new({
-            //                     let description = description.clone();
-            //                     move |cx| {
-            //                         div()
-            //                             .w_full()
-            //                             .py_1()
-            //                             .px_2()
-            //                             .bg(cx.theme().colors().editor_background)
-            //                             .border_y_1()
-            //                             .border_color(cx.theme().status().info_border)
-            //                             .child(
-            //                                 Label::new(description.clone())
-            //                                     .color(Color::Muted)
-            //                                     .size(LabelSize::Small),
-            //                             )
-            //                             .into_any_element()
-            //                     }
-            //                 }),
-            //                 priority: 0,
-            //             }],
-            //             None,
-            //             cx,
-            //         );
-            //         decorations.model_explanation = new_block_id.into_iter().next();
-            //     }
-            // } else if let Some(block_id) = decorations.model_explanation {
-            //     // Hide the block if there's no description
-            //     editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
-            //     let new_block_id = editor.insert_blocks(
-            //         [BlockProperties {
-            //             style: BlockStyle::Flex,
-            //             placement: BlockPlacement::Below(assist.range.end),
-            //             height: Some(0),
-            //             render: Arc::new(|_cx| div().into_any_element()),
-            //             priority: 0,
-            //         }],
-            //         None,
-            //         cx,
-            //     );
-            //     decorations.model_explanation = new_block_id.into_iter().next();
-            // }
-
            let old_blocks = mem::take(&mut decorations.removed_line_block_ids);
            editor.remove_blocks(old_blocks, None, cx);

@@ -1760,7 +1686,6 @@ impl InlineAssist {
        editor: &Entity<Editor>,
        prompt_editor: &Entity<PromptEditor<BufferCodegen>>,
        prompt_block_id: CustomBlockId,
-        tool_description_block_id: CustomBlockId,
        end_block_id: CustomBlockId,
        range: Range<Anchor>,
        codegen: Entity<BufferCodegen>,
@@ -1775,8 +1700,7 @@ impl InlineAssist {
            decorations: Some(InlineAssistDecorations {
                prompt_block_id,
                prompt_editor: prompt_editor.clone(),
-                removed_line_block_ids: Default::default(),
-                model_explanation: Some(tool_description_block_id),
+                removed_line_block_ids: HashSet::default(),
                end_block_id,
            }),
            range,
@@ -1880,7 +1804,6 @@ struct InlineAssistDecorations {
    prompt_block_id: CustomBlockId,
    prompt_editor: Entity<PromptEditor<BufferCodegen>>,
    removed_line_block_ids: HashSet<CustomBlockId>,
-    model_explanation: Option<CustomBlockId>,
    end_block_id: CustomBlockId,
 }

--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -8,28 +8,24 @@ use editor::{
    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
    actions::{MoveDown, MoveUp},
 };
-use feature_flags::{FeatureFlag, FeatureFlagAppExt};
 use fs::Fs;
 use gpui::{
-    AnyElement, App, ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    Subscription, TextStyle, TextStyleRefinement, WeakEntity, Window, actions,
+    AnyElement, App, Context, CursorStyle, Entity, EventEmitter, FocusHandle, Focusable,
+    Subscription, TextStyle, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
-use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
 use parking_lot::Mutex;
 use project::Project;
 use prompt_store::PromptStore;
 use settings::Settings;
+use std::cmp;
 use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;
-use std::{cmp, mem};
 use theme::ThemeSettings;
 use ui::utils::WithRemSize;
 use ui::{IconButtonShape, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
-use uuid::Uuid;
-use workspace::notifications::NotificationId;
-use workspace::{Toast, Workspace};
+use workspace::Workspace;
 use zed_actions::agent::ToggleModelSelector;

 use crate::agent_model_selector::AgentModelSelector;
@@ -42,58 +38,6 @@ use crate::mention_set::{MentionSet, crease_for_mention};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};

-actions!(inline_assistant, [ThumbsUpResult, ThumbsDownResult]);
-
-pub struct InlineAssistRatingFeatureFlag;
-
-impl FeatureFlag for InlineAssistRatingFeatureFlag {
-    const NAME: &'static str = "inline-assist-rating";
-
-    fn enabled_for_staff() -> bool {
-        false
-    }
-}
-
-enum RatingState {
-    Pending,
-    GeneratedCompletion(Option<String>),
-    Rated(Uuid),
-}
-
-impl RatingState {
-    fn is_pending(&self) -> bool {
-        matches!(self, RatingState::Pending)
-    }
-
-    fn rating_id(&self) -> Option<Uuid> {
-        match self {
-            RatingState::Pending => None,
-            RatingState::GeneratedCompletion(_) => None,
-            RatingState::Rated(id) => Some(*id),
-        }
-    }
-
-    fn rate(&mut self) -> (Uuid, Option<String>) {
-        let id = Uuid::new_v4();
-        let old_state = mem::replace(self, RatingState::Rated(id));
-        let completion = match old_state {
-            RatingState::Pending => None,
-            RatingState::GeneratedCompletion(completion) => completion,
-            RatingState::Rated(_) => None,
-        };
-
-        (id, completion)
-    }
-
-    fn reset(&mut self) {
-        *self = RatingState::Pending;
-    }
-
-    fn generated_completion(&mut self, generated_completion: Option<String>) {
-        *self = RatingState::GeneratedCompletion(generated_completion);
-    }
-}
-
 pub struct PromptEditor<T> {
    pub editor: Entity<Editor>,
    mode: PromptEditorMode,
@@ -109,7 +53,6 @@ pub struct PromptEditor<T> {
    _codegen_subscription: Subscription,
    editor_subscriptions: Vec<Subscription>,
    show_rate_limit_notice: bool,
-    rated: RatingState,
    _phantom: std::marker::PhantomData<T>,
 }

@@ -122,7 +65,7 @@ impl<T: 'static> Render for PromptEditor<T> {

        const RIGHT_PADDING: Pixels = px(9.);

-        let (left_gutter_width, right_padding, explanation) = match &self.mode {
+        let (left_gutter_width, right_padding) = match &self.mode {
            PromptEditorMode::Buffer {
                id: _,
                codegen,
@@ -140,23 +83,17 @@ impl<T: 'static> Render for PromptEditor<T> {
                let left_gutter_width = gutter.full_width() + (gutter.margin / 2.0);
                let right_padding = editor_margins.right + RIGHT_PADDING;

-                let explanation = codegen
-                    .active_alternative()
-                    .read(cx)
-                    .model_explanation
-                    .clone();
-
-                (left_gutter_width, right_padding, explanation)
+                (left_gutter_width, right_padding)
            }
            PromptEditorMode::Terminal { .. } => {
                // Give the equivalent of the same left-padding that we're using on the right
-                (Pixels::from(40.0), Pixels::from(24.), None)
+                (Pixels::from(40.0), Pixels::from(24.))
            }
        };

        let bottom_padding = match &self.mode {
            PromptEditorMode::Buffer { .. } => rems_from_px(2.0),
-            PromptEditorMode::Terminal { .. } => rems_from_px(4.0),
+            PromptEditorMode::Terminal { .. } => rems_from_px(8.0),
        };

        buttons.extend(self.render_buttons(window, cx));
@@ -174,33 +111,22 @@ impl<T: 'static> Render for PromptEditor<T> {
                this.trigger_completion_menu(window, cx);
            }));

-        let markdown = window.use_state(cx, |_, cx| Markdown::new("".into(), None, None, cx));
-
-        if let Some(explanation) = &explanation {
-            markdown.update(cx, |markdown, cx| {
-                markdown.reset(explanation.clone(), cx);
-            });
-        }
-
-        let explanation_label = self
-            .render_markdown(markdown, markdown_style(window, cx))
-            .into_any_element();
-
        v_flex()
            .key_context("PromptEditor")
            .capture_action(cx.listener(Self::paste))
+            .bg(cx.theme().colors().editor_background)
            .block_mouse_except_scroll()
+            .gap_0p5()
+            .border_y_1()
+            .border_color(cx.theme().status().info_border)
            .size_full()
            .pt_0p5()
            .pb(bottom_padding)
            .pr(right_padding)
-            .gap_0p5()
-            .justify_center()
-            .border_y_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().editor_background)
            .child(
                h_flex()
+                    .items_start()
+                    .cursor(CursorStyle::Arrow)
                    .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
                        this.model_selector
                            .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
@@ -209,20 +135,18 @@ impl<T: 'static> Render for PromptEditor<T> {
                    .on_action(cx.listener(Self::cancel))
                    .on_action(cx.listener(Self::move_up))
                    .on_action(cx.listener(Self::move_down))
-                    .on_action(cx.listener(Self::thumbs_up))
-                    .on_action(cx.listener(Self::thumbs_down))
                    .capture_action(cx.listener(Self::cycle_prev))
                    .capture_action(cx.listener(Self::cycle_next))
                    .child(
                        WithRemSize::new(ui_font_size)
-                            .h_full()
-                            .w(left_gutter_width)
                            .flex()
                            .flex_row()
                            .flex_shrink_0()
                            .items_center()
+                            .h_full()
+                            .w(left_gutter_width)
                            .justify_center()
-                            .gap_1()
+                            .gap_2()
                            .child(self.render_close_button(cx))
                            .map(|el| {
                                let CodegenStatus::Error(error) = self.codegen_status(cx) else {
@@ -253,83 +177,26 @@ impl<T: 'static> Render for PromptEditor<T> {
                                    .flex_row()
                                    .items_center()
                                    .gap_1()
-                                    .child(add_context_button)
-                                    .child(self.model_selector.clone())
                                    .children(buttons),
                            ),
                    ),
            )
-            .when_some(explanation, |this, _| {
-                this.child(
-                    h_flex()
-                        .size_full()
-                        .justify_center()
-                        .child(div().w(left_gutter_width + px(6.)))
-                        .child(
-                            div()
-                                .size_full()
-                                .min_w_0()
-                                .pt(rems_from_px(3.))
-                                .pl_0p5()
-                                .flex_1()
-                                .border_t_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(explanation_label),
-                        ),
-                )
-            })
-    }
-}
-
-fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let mut text_style = window.text_style();
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        color: Some(colors.text),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: colors.element_selection_background,
-        heading_level_styles: Some(HeadingLevelStyles {
-            h1: Some(TextStyleRefinement {
-                font_size: Some(rems(1.15).into()),
-                ..Default::default()
-            }),
-            h2: Some(TextStyleRefinement {
-                font_size: Some(rems(1.1).into()),
-                ..Default::default()
-            }),
-            h3: Some(TextStyleRefinement {
-                font_size: Some(rems(1.05).into()),
-                ..Default::default()
-            }),
-            h4: Some(TextStyleRefinement {
-                font_size: Some(rems(1.).into()),
-                ..Default::default()
-            }),
-            h5: Some(TextStyleRefinement {
-                font_size: Some(rems(0.95).into()),
-                ..Default::default()
-            }),
-            h6: Some(TextStyleRefinement {
-                font_size: Some(rems(0.875).into()),
-                ..Default::default()
-            }),
-        }),
-        inline_code: TextStyleRefinement {
-            font_family: Some(theme_settings.buffer_font.family.clone()),
-            font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-            font_features: Some(theme_settings.buffer_font.features.clone()),
-            background_color: Some(colors.editor_foreground.opacity(0.08)),
-            ..Default::default()
-        },
-        ..Default::default()
+            .child(
+                WithRemSize::new(ui_font_size)
+                    .flex()
+                    .flex_row()
+                    .items_center()
+                    .child(h_flex().flex_shrink_0().w(left_gutter_width))
+                    .child(
+                        h_flex()
+                            .w_full()
+                            .pl_1()
+                            .items_start()
+                            .justify_between()
+                            .child(add_context_button)
+                            .child(self.model_selector.clone()),
+                    ),
+            )
    }
 }

@@ -487,7 +354,6 @@ impl<T: 'static> PromptEditor<T> {
                }

                self.edited_since_done = true;
-                self.rated.reset();
                cx.notify();
            }
            EditorEvent::Blurred => {
@@ -575,121 +441,6 @@ impl<T: 'static> PromptEditor<T> {
        }
    }

-    fn thumbs_up(&mut self, _: &ThumbsUpResult, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.rated.is_pending() {
-            self.toast("Still generating...", None, cx);
-            return;
-        }
-
-        if let Some(rating_id) = self.rated.rating_id() {
-            self.toast("Already rated this completion", Some(rating_id), cx);
-            return;
-        }
-
-        let (rating_id, completion) = self.rated.rate();
-
-        let selected_text = match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                codegen.read(cx).selected_text(cx).map(|s| s.to_string())
-            }
-            PromptEditorMode::Terminal { .. } => None,
-        };
-
-        let model_info = self.model_selector.read(cx).active_model(cx);
-        let model_id = {
-            let Some(configured_model) = model_info else {
-                self.toast("No configured model", None, cx);
-                return;
-            };
-
-            configured_model.model.telemetry_id()
-        };
-
-        let prompt = self.editor.read(cx).text(cx);
-
-        telemetry::event!(
-            "Inline Assistant Rated",
-            rating = "positive",
-            model = model_id,
-            prompt = prompt,
-            completion = completion,
-            selected_text = selected_text,
-            rating_id = rating_id.to_string()
-        );
-
-        cx.notify();
-    }
-
-    fn thumbs_down(&mut self, _: &ThumbsDownResult, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.rated.is_pending() {
-            self.toast("Still generating...", None, cx);
-            return;
-        }
-        if let Some(rating_id) = self.rated.rating_id() {
-            self.toast("Already rated this completion", Some(rating_id), cx);
-            return;
-        }
-
-        let (rating_id, completion) = self.rated.rate();
-
-        let selected_text = match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                codegen.read(cx).selected_text(cx).map(|s| s.to_string())
-            }
-            PromptEditorMode::Terminal { .. } => None,
-        };
-
-        let model_info = self.model_selector.read(cx).active_model(cx);
-        let model_telemetry_id = {
-            let Some(configured_model) = model_info else {
-                self.toast("No configured model", None, cx);
-                return;
-            };
-
-            configured_model.model.telemetry_id()
-        };
-
-        let prompt = self.editor.read(cx).text(cx);
-
-        telemetry::event!(
-            "Inline Assistant Rated",
-            rating = "negative",
-            model = model_telemetry_id,
-            prompt = prompt,
-            completion = completion,
-            selected_text = selected_text,
-            rating_id = rating_id.to_string()
-        );
-
-        cx.notify();
-    }
-
-    fn toast(&mut self, msg: &str, uuid: Option<Uuid>, cx: &mut Context<'_, PromptEditor<T>>) {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                enum InlinePromptRating {}
-                workspace.show_toast(
-                    {
-                        let mut toast = Toast::new(
-                            NotificationId::unique::<InlinePromptRating>(),
-                            msg.to_string(),
-                        )
-                        .autohide();
-
-                        if let Some(uuid) = uuid {
-                            toast = toast.on_click("Click to copy rating ID", move |_, cx| {
-                                cx.write_to_clipboard(ClipboardItem::new_string(uuid.to_string()));
-                            });
-                        };
-
-                        toast
-                    },
-                    cx,
-                );
-            })
-            .ok();
-    }
-
    fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
        if let Some(ix) = self.prompt_history_ix {
            if ix > 0 {
@@ -795,9 +546,6 @@ impl<T: 'static> PromptEditor<T> {
                            .into_any_element(),
                    ]
                } else {
-                    let show_rating_buttons = cx.has_flag::<InlineAssistRatingFeatureFlag>();
-                    let rated = self.rated.rating_id().is_some();
-
                    let accept = IconButton::new("accept", IconName::Check)
                        .icon_color(Color::Info)
                        .shape(IconButtonShape::Square)
@@ -809,59 +557,25 @@ impl<T: 'static> PromptEditor<T> {
                        }))
                        .into_any_element();

-                    let mut buttons = Vec::new();
-
-                    if show_rating_buttons {
-                        buttons.push(
-                            IconButton::new("thumbs-down", IconName::ThumbsDown)
-                                .icon_color(if rated { Color::Muted } else { Color::Default })
-                                .shape(IconButtonShape::Square)
-                                .disabled(rated)
-                                .tooltip(Tooltip::text("Bad result"))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.thumbs_down(&ThumbsDownResult, window, cx);
-                                }))
-                                .into_any_element(),
-                        );
-
-                        buttons.push(
-                            IconButton::new("thumbs-up", IconName::ThumbsUp)
-                                .icon_color(if rated { Color::Muted } else { Color::Default })
-                                .shape(IconButtonShape::Square)
-                                .disabled(rated)
-                                .tooltip(Tooltip::text("Good result"))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.thumbs_up(&ThumbsUpResult, window, cx);
-                                }))
-                                .into_any_element(),
-                        );
-                    }
-
-                    buttons.push(accept);
-
                    match &self.mode {
-                        PromptEditorMode::Terminal { .. } => {
-                            buttons.push(
-                                IconButton::new("confirm", IconName::PlayFilled)
-                                    .icon_color(Color::Info)
-                                    .shape(IconButtonShape::Square)
-                                    .tooltip(|_window, cx| {
-                                        Tooltip::for_action(
-                                            "Execute Generated Command",
-                                            &menu::SecondaryConfirm,
-                                            cx,
-                                        )
-                                    })
-                                    .on_click(cx.listener(|_, _, _, cx| {
-                                        cx.emit(PromptEditorEvent::ConfirmRequested {
-                                            execute: true,
-                                        });
-                                    }))
-                                    .into_any_element(),
-                            );
-                            buttons
-                        }
-                        PromptEditorMode::Buffer { .. } => buttons,
+                        PromptEditorMode::Terminal { .. } => vec![
+                            accept,
+                            IconButton::new("confirm", IconName::PlayFilled)
+                                .icon_color(Color::Info)
+                                .shape(IconButtonShape::Square)
+                                .tooltip(|_window, cx| {
+                                    Tooltip::for_action(
+                                        "Execute Generated Command",
+                                        &menu::SecondaryConfirm,
+                                        cx,
+                                    )
+                                })
+                                .on_click(cx.listener(|_, _, _, cx| {
+                                    cx.emit(PromptEditorEvent::ConfirmRequested { execute: true });
+                                }))
+                                .into_any_element(),
+                        ],
+                        PromptEditorMode::Buffer { .. } => vec![accept],
                    }
                }
            }
@@ -1045,10 +759,6 @@ impl<T: 'static> PromptEditor<T> {
            })
            .into_any_element()
    }
-
-    fn render_markdown(&self, markdown: Entity<Markdown>, style: MarkdownStyle) -> MarkdownElement {
-        MarkdownElement::new(markdown, style)
-    }
 }

 pub enum PromptEditorMode {
@@ -1190,7 +900,6 @@ impl PromptEditor<BufferCodegen> {
            editor_subscriptions: Vec::new(),
            show_rate_limit_notice: false,
            mode,
-            rated: RatingState::Pending,
            _phantom: Default::default(),
        };

@@ -1201,7 +910,7 @@ impl PromptEditor<BufferCodegen> {

    fn handle_codegen_changed(
        &mut self,
-        codegen: Entity<BufferCodegen>,
+        _: Entity<BufferCodegen>,
        cx: &mut Context<PromptEditor<BufferCodegen>>,
    ) {
        match self.codegen_status(cx) {
@@ -1210,13 +919,10 @@ impl PromptEditor<BufferCodegen> {
                    .update(cx, |editor, _| editor.set_read_only(false));
            }
            CodegenStatus::Pending => {
-                self.rated.reset();
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(true));
            }
            CodegenStatus::Done => {
-                let completion = codegen.read(cx).active_completion(cx);
-                self.rated.generated_completion(completion);
                self.edited_since_done = false;
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(false));
@@ -1337,7 +1043,6 @@ impl PromptEditor<TerminalCodegen> {
            editor_subscriptions: Vec::new(),
            mode,
            show_rate_limit_notice: false,
-            rated: RatingState::Pending,
            _phantom: Default::default(),
        };
        this.count_lines(cx);
@@ -1370,20 +1075,17 @@ impl PromptEditor<TerminalCodegen> {
        }
    }

-    fn handle_codegen_changed(&mut self, codegen: Entity<TerminalCodegen>, cx: &mut Context<Self>) {
+    fn handle_codegen_changed(&mut self, _: Entity<TerminalCodegen>, cx: &mut Context<Self>) {
        match &self.codegen().read(cx).status {
            CodegenStatus::Idle => {
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(false));
            }
            CodegenStatus::Pending => {
-                self.rated = RatingState::Pending;
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(true));
            }
            CodegenStatus::Done | CodegenStatus::Error(_) => {
-                self.rated
-                    .generated_completion(codegen.read(cx).completion());
                self.edited_since_done = false;
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(false));
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -1,13 +1,12 @@
 use std::{cmp::Reverse, sync::Arc};

 use collections::IndexMap;
+use futures::{StreamExt, channel::mpsc};
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AnyElement, App, BackgroundExecutor, DismissEvent, FocusHandle, Subscription, Task,
-};
+use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, FocusHandle, Task};
 use language_model::{
-    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProviderId,
-    LanguageModelRegistry,
+    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProvider,
+    LanguageModelProviderId, LanguageModelRegistry,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
@@ -57,12 +56,12 @@ fn all_models(cx: &App) -> GroupedModels {
                .into_iter()
                .map(|model| ModelInfo {
                    model,
-                    icon: provider.icon(),
+                    icon: ProviderIcon::from_provider(provider.as_ref()),
                })
        })
        .collect();

-    let all = providers
+    let all: Vec<ModelInfo> = providers
        .iter()
        .flat_map(|provider| {
            provider
@@ -70,7 +69,7 @@ fn all_models(cx: &App) -> GroupedModels {
                .into_iter()
                .map(|model| ModelInfo {
                    model,
-                    icon: provider.icon(),
+                    icon: ProviderIcon::from_provider(provider.as_ref()),
                })
        })
        .collect();
@@ -78,10 +77,26 @@ fn all_models(cx: &App) -> GroupedModels {
    GroupedModels::new(all, recommended)
 }

+#[derive(Clone)]
+enum ProviderIcon {
+    Name(IconName),
+    Path(SharedString),
+}
+
+impl ProviderIcon {
+    fn from_provider(provider: &dyn LanguageModelProvider) -> Self {
+        if let Some(path) = provider.icon_path() {
+            Self::Path(path)
+        } else {
+            Self::Name(provider.icon())
+        }
+    }
+}
+
 #[derive(Clone)]
 struct ModelInfo {
    model: Arc<dyn LanguageModel>,
-    icon: IconName,
+    icon: ProviderIcon,
 }

 pub struct LanguageModelPickerDelegate {
@@ -91,7 +106,7 @@ pub struct LanguageModelPickerDelegate {
    filtered_entries: Vec<LanguageModelPickerEntry>,
    selected_index: usize,
    _authenticate_all_providers_task: Task<()>,
-    _subscriptions: Vec<Subscription>,
+    _refresh_models_task: Task<()>,
    popover_styles: bool,
    focus_handle: FocusHandle,
 }
@@ -116,24 +131,40 @@ impl LanguageModelPickerDelegate {
            filtered_entries: entries,
            get_active_model: Arc::new(get_active_model),
            _authenticate_all_providers_task: Self::authenticate_all_providers(cx),
-            _subscriptions: vec![cx.subscribe_in(
-                &LanguageModelRegistry::global(cx),
-                window,
-                |picker, _, event, window, cx| {
-                    match event {
-                        language_model::Event::ProviderStateChanged(_)
-                        | language_model::Event::AddedProvider(_)
-                        | language_model::Event::RemovedProvider(_) => {
-                            let query = picker.query(cx);
-                            picker.delegate.all_models = Arc::new(all_models(cx));
-                            // Update matches will automatically drop the previous task
-                            // if we get a provider event again
-                            picker.update_matches(query, window, cx)
-                        }
-                        _ => {}
+            _refresh_models_task: {
+                // Create a channel to signal when models need refreshing
+                let (refresh_tx, mut refresh_rx) = mpsc::unbounded::<()>();
+
+                // Subscribe to registry events and send refresh signals through the channel
+                let registry = LanguageModelRegistry::global(cx);
+                cx.subscribe(&registry, move |_picker, _, event, _cx| match event {
+                    language_model::Event::ProviderStateChanged(_) => {
+                        refresh_tx.unbounded_send(()).ok();
                    }
-                },
-            )],
+                    language_model::Event::AddedProvider(_) => {
+                        refresh_tx.unbounded_send(()).ok();
+                    }
+                    language_model::Event::RemovedProvider(_) => {
+                        refresh_tx.unbounded_send(()).ok();
+                    }
+                    _ => {}
+                })
+                .detach();
+
+                // Spawn a task that listens for refresh signals and updates the picker
+                cx.spawn_in(window, async move |this, cx| {
+                    while let Some(()) = refresh_rx.next().await {
+                        let result = this.update_in(cx, |picker, window, cx| {
+                            picker.delegate.all_models = Arc::new(all_models(cx));
+                            picker.refresh(window, cx);
+                        });
+                        if result.is_err() {
+                            // Picker was dropped, exit the loop
+                            break;
+                        }
+                    }
+                })
+            },
            popover_styles,
            focus_handle,
        }
@@ -504,11 +535,16 @@ impl PickerDelegate for LanguageModelPickerDelegate {
                            h_flex()
                                .w_full()
                                .gap_1p5()
-                                .child(
-                                    Icon::new(model_info.icon)
+                                .child(match &model_info.icon {
+                                    ProviderIcon::Name(icon_name) => Icon::new(*icon_name)
                                        .color(model_icon_color)
                                        .size(IconSize::Small),
-                                )
+                                    ProviderIcon::Path(icon_path) => {
+                                        Icon::from_external_svg(icon_path.clone())
+                                            .color(model_icon_color)
+                                            .size(IconSize::Small)
+                                    }
+                                })
                                .child(Label::new(model_info.model.name().0).truncate()),
                        )
                        .end_slot(div().pr_3().when(is_selected, |this| {
@@ -657,7 +693,7 @@ mod tests {
            .into_iter()
            .map(|(provider, name)| ModelInfo {
                model: Arc::new(TestLanguageModel::new(name, provider)),
-                icon: IconName::Ai,
+                icon: ProviderIcon::Name(IconName::Ai),
            })
            .collect()
    }
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -542,7 +542,7 @@ impl PickerDelegate for ProfilePickerDelegate {
                let is_active = active_id == candidate.id;

                Some(
-                    ListItem::new(candidate.id.0.clone())
+                    ListItem::new(SharedString::from(candidate.id.0.clone()))
                        .inset(true)
                        .spacing(ListItemSpacing::Sparse)
                        .toggle_state(selected)
--- a/crates/agent_ui/src/terminal_codegen.rs
+++ b/crates/agent_ui/src/terminal_codegen.rs
@@ -135,12 +135,6 @@ impl TerminalCodegen {
        cx.notify();
    }

-    pub fn completion(&self) -> Option<String> {
-        self.transaction
-            .as_ref()
-            .map(|transaction| transaction.completion.clone())
-    }
-
    pub fn stop(&mut self, cx: &mut Context<Self>) {
        self.status = CodegenStatus::Done;
        self.generation = Task::ready(());
@@ -173,32 +167,27 @@ pub const CLEAR_INPUT: &str = "\x03";
 const CARRIAGE_RETURN: &str = "\x0d";

 struct TerminalTransaction {
-    completion: String,
    terminal: Entity<Terminal>,
 }

 impl TerminalTransaction {
    pub fn start(terminal: Entity<Terminal>) -> Self {
-        Self {
-            completion: String::new(),
-            terminal,
-        }
+        Self { terminal }
    }

    pub fn push(&mut self, hunk: String, cx: &mut App) {
        // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
        let input = Self::sanitize_input(hunk);
-        self.completion.push_str(&input);
        self.terminal
            .update(cx, |terminal, _| terminal.input(input.into_bytes()));
    }

-    pub fn undo(self, cx: &mut App) {
+    pub fn undo(&self, cx: &mut App) {
        self.terminal
            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
    }

-    pub fn complete(self, cx: &mut App) {
+    pub fn complete(&self, cx: &mut App) {
        self.terminal
            .update(cx, |terminal, _| terminal.input(CARRIAGE_RETURN.as_bytes()));
    }
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1682,98 +1682,6 @@ impl TextThreadEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let editor_clipboard_selections = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => {
-                    text.metadata_json::<Vec<editor::ClipboardSelection>>()
-                }
-                _ => None,
-            });
-
-        let has_file_context = editor_clipboard_selections
-            .as_ref()
-            .is_some_and(|selections| {
-                selections
-                    .iter()
-                    .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
-            });
-
-        if has_file_context {
-            if let Some(clipboard_item) = cx.read_from_clipboard() {
-                if let Some(ClipboardEntry::String(clipboard_text)) =
-                    clipboard_item.entries().first()
-                {
-                    if let Some(selections) = editor_clipboard_selections {
-                        cx.stop_propagation();
-
-                        let text = clipboard_text.text();
-                        self.editor.update(cx, |editor, cx| {
-                            let mut current_offset = 0;
-                            let weak_editor = cx.entity().downgrade();
-
-                            for selection in selections {
-                                if let (Some(file_path), Some(line_range)) =
-                                    (selection.file_path, selection.line_range)
-                                {
-                                    let selected_text =
-                                        &text[current_offset..current_offset + selection.len];
-                                    let fence = assistant_slash_commands::codeblock_fence_for_path(
-                                        file_path.to_str(),
-                                        Some(line_range.clone()),
-                                    );
-                                    let formatted_text = format!("{fence}{selected_text}\n```");
-
-                                    let insert_point = editor
-                                        .selections
-                                        .newest::<Point>(&editor.display_snapshot(cx))
-                                        .head();
-                                    let start_row = MultiBufferRow(insert_point.row);
-
-                                    editor.insert(&formatted_text, window, cx);
-
-                                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                                    let anchor_before = snapshot.anchor_after(insert_point);
-                                    let anchor_after = editor
-                                        .selections
-                                        .newest_anchor()
-                                        .head()
-                                        .bias_left(&snapshot);
-
-                                    editor.insert("\n", window, cx);
-
-                                    let crease_text = acp_thread::selection_name(
-                                        Some(file_path.as_ref()),
-                                        &line_range,
-                                    );
-
-                                    let fold_placeholder = quote_selection_fold_placeholder(
-                                        crease_text,
-                                        weak_editor.clone(),
-                                    );
-                                    let crease = Crease::inline(
-                                        anchor_before..anchor_after,
-                                        fold_placeholder,
-                                        render_quote_selection_output_toggle,
-                                        |_, _, _, _| Empty.into_any(),
-                                    );
-                                    editor.insert_creases(vec![crease], cx);
-                                    editor.fold_at(start_row, window, cx);
-
-                                    current_offset += selection.len;
-                                    if !selection.is_entire_line && current_offset < text.len() {
-                                        current_offset += 1;
-                                    }
-                                }
-                            }
-                        });
-                        return;
-                    }
-                }
-            }
-        }
-
        cx.stop_propagation();

        let mut images = if let Some(item) = cx.read_from_clipboard() {
@@ -2189,7 +2097,8 @@ impl TextThreadEditor {
            .default_model()
            .map(|default| default.provider);

-        let provider_icon = match active_provider {
+        let provider_icon_path = active_provider.as_ref().and_then(|p| p.icon_path());
+        let provider_icon_name = match &active_provider {
            Some(provider) => provider.icon(),
            None => IconName::Ai,
        };
@@ -2201,6 +2110,16 @@ impl TextThreadEditor {
            (Color::Muted, IconName::ChevronDown)
        };

+        let provider_icon_element = if let Some(icon_path) = provider_icon_path {
+            Icon::from_external_svg(icon_path)
+                .color(color)
+                .size(IconSize::XSmall)
+        } else {
+            Icon::new(provider_icon_name)
+                .color(color)
+                .size(IconSize::XSmall)
+        };
+
        PickerPopoverMenu::new(
            self.language_model_selector.clone(),
            ButtonLike::new("active-model")
@@ -2208,7 +2127,7 @@ impl TextThreadEditor {
                .child(
                    h_flex()
                        .gap_0p5()
-                        .child(Icon::new(provider_icon).color(color).size(IconSize::XSmall))
+                        .child(provider_icon_element)
                        .child(
                            Label::new(model_name)
                                .color(color)
--- a/crates/agent_ui/src/ui/agent_notification.rs
+++ b/crates/agent_ui/src/ui/agent_notification.rs
@@ -106,6 +106,9 @@ impl Render for AgentNotification {
            .font(ui_font)
            .border_color(cx.theme().colors().border)
            .rounded_xl()
+            .on_click(cx.listener(|_, _, _, cx| {
+                cx.emit(AgentNotificationEvent::Accepted);
+            }))
            .child(
                h_flex()
                    .items_start()
--- a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
+++ b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
@@ -1,9 +1,25 @@
 use gpui::{Action, IntoElement, ParentElement, RenderOnce, point};
-use language_model::{LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
+use language_model::{LanguageModelProvider, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
 use ui::{Divider, List, ListBulletItem, prelude::*};

+#[derive(Clone)]
+enum ProviderIcon {
+    Name(IconName),
+    Path(SharedString),
+}
+
+impl ProviderIcon {
+    fn from_provider(provider: &dyn LanguageModelProvider) -> Self {
+        if let Some(path) = provider.icon_path() {
+            Self::Path(path)
+        } else {
+            Self::Name(provider.icon())
+        }
+    }
+}
+
 pub struct ApiKeysWithProviders {
-    configured_providers: Vec<(IconName, SharedString)>,
+    configured_providers: Vec<(ProviderIcon, SharedString)>,
 }

 impl ApiKeysWithProviders {
@@ -26,14 +42,19 @@ impl ApiKeysWithProviders {
        }
    }

-    fn compute_configured_providers(cx: &App) -> Vec<(IconName, SharedString)> {
+    fn compute_configured_providers(cx: &App) -> Vec<(ProviderIcon, SharedString)> {
        LanguageModelRegistry::read_global(cx)
            .providers()
            .iter()
            .filter(|provider| {
                provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
            })
-            .map(|provider| (provider.icon(), provider.name().0))
+            .map(|provider| {
+                (
+                    ProviderIcon::from_provider(provider.as_ref()),
+                    provider.name().0,
+                )
+            })
            .collect()
    }
 }
@@ -47,7 +68,14 @@ impl Render for ApiKeysWithProviders {
                .map(|(icon, name)| {
                    h_flex()
                        .gap_1p5()
-                        .child(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted))
+                        .child(match icon {
+                            ProviderIcon::Name(icon_name) => Icon::new(icon_name)
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                            ProviderIcon::Path(icon_path) => Icon::from_external_svg(icon_path)
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                        })
                        .child(Label::new(name))
                });
        div()
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
@@ -11,7 +11,7 @@ use crate::{AgentPanelOnboardingCard, ApiKeysWithoutProviders, ZedAiOnboarding};
 pub struct AgentPanelOnboarding {
    user_store: Entity<UserStore>,
    client: Arc<Client>,
-    configured_providers: Vec<(IconName, SharedString)>,
+    has_configured_providers: bool,
    continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
 }

@@ -28,7 +28,7 @@ impl AgentPanelOnboarding {
                language_model::Event::ProviderStateChanged(_)
                | language_model::Event::AddedProvider(_)
                | language_model::Event::RemovedProvider(_) => {
-                    this.configured_providers = Self::compute_available_providers(cx)
+                    this.has_configured_providers = Self::has_configured_providers(cx)
                }
                _ => {}
            },
@@ -38,20 +38,16 @@ impl AgentPanelOnboarding {
        Self {
            user_store,
            client,
-            configured_providers: Self::compute_available_providers(cx),
+            has_configured_providers: Self::has_configured_providers(cx),
            continue_with_zed_ai: Arc::new(continue_with_zed_ai),
        }
    }

-    fn compute_available_providers(cx: &App) -> Vec<(IconName, SharedString)> {
+    fn has_configured_providers(cx: &App) -> bool {
        LanguageModelRegistry::read_global(cx)
            .providers()
            .iter()
-            .filter(|provider| {
-                provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
-            })
-            .map(|provider| (provider.icon(), provider.name().0))
-            .collect()
+            .any(|provider| provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID)
    }
 }

@@ -81,7 +77,7 @@ impl Render for AgentPanelOnboarding {
                }),
            )
            .map(|this| {
-                if enrolled_in_trial || is_pro_user || !self.configured_providers.is_empty() {
+                if enrolled_in_trial || is_pro_user || self.has_configured_providers {
                    this
                } else {
                    this.child(ApiKeysWithoutProviders::new())
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -8,12 +8,10 @@ use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::B
 use http_client::http::{self, HeaderMap, HeaderValue};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, StatusCode};
 use serde::{Deserialize, Serialize};
-pub use settings::{AnthropicAvailableModel as AvailableModel, ModelMode};
+pub use settings::ModelMode;
 use strum::{EnumIter, EnumString};
 use thiserror::Error;

-pub mod batches;
-
 pub const ANTHROPIC_API_URL: &str = "https://api.anthropic.com";

 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
@@ -467,7 +465,6 @@ impl Model {
    }
 }

-/// Generate completion with streaming.
 pub async fn stream_completion(
    client: &dyn HttpClient,
    api_url: &str,
@@ -480,101 +477,6 @@ pub async fn stream_completion(
        .map(|output| output.0)
 }

-/// Generate completion without streaming.
-pub async fn non_streaming_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-    beta_headers: Option<String>,
-) -> Result<Response, AnthropicError> {
-    let (mut response, rate_limits) =
-        send_request(client, api_url, api_key, &request, beta_headers).await?;
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
-    } else {
-        Err(handle_error_response(response, rate_limits).await)
-    }
-}
-
-async fn send_request(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: impl Serialize,
-    beta_headers: Option<String>,
-) -> Result<(http::Response<AsyncBody>, RateLimitInfo), AnthropicError> {
-    let uri = format!("{api_url}/v1/messages");
-
-    let mut request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim())
-        .header("Content-Type", "application/json");
-
-    if let Some(beta_headers) = beta_headers {
-        request_builder = request_builder.header("Anthropic-Beta", beta_headers);
-    }
-
-    let serialized_request =
-        serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
-    let request = request_builder
-        .body(AsyncBody::from(serialized_request))
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let response = client
-        .send(request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    Ok((response, rate_limits))
-}
-
-async fn handle_error_response(
-    mut response: http::Response<AsyncBody>,
-    rate_limits: RateLimitInfo,
-) -> AnthropicError {
-    if response.status().as_u16() == 529 {
-        return AnthropicError::ServerOverloaded {
-            retry_after: rate_limits.retry_after,
-        };
-    }
-
-    if let Some(retry_after) = rate_limits.retry_after {
-        return AnthropicError::RateLimit { retry_after };
-    }
-
-    let mut body = String::new();
-    let read_result = response
-        .body_mut()
-        .read_to_string(&mut body)
-        .await
-        .map_err(AnthropicError::ReadResponse);
-
-    if let Err(err) = read_result {
-        return err;
-    }
-
-    match serde_json::from_str::<Event>(&body) {
-        Ok(Event::Error { error }) => AnthropicError::ApiError(error),
-        Ok(_) | Err(_) => AnthropicError::HttpResponseError {
-            status_code: response.status(),
-            message: body,
-        },
-    }
-}
-
 /// An individual rate limit.
 #[derive(Debug)]
 pub struct RateLimit {
@@ -678,10 +580,30 @@ pub async fn stream_completion_with_rate_limit_info(
        base: request,
        stream: true,
    };
+    let uri = format!("{api_url}/v1/messages");

-    let (response, rate_limits) =
-        send_request(client, api_url, api_key, &request, beta_headers).await?;
+    let mut request_builder = HttpRequest::builder()
+        .method(Method::POST)
+        .uri(uri)
+        .header("Anthropic-Version", "2023-06-01")
+        .header("X-Api-Key", api_key.trim())
+        .header("Content-Type", "application/json");

+    if let Some(beta_headers) = beta_headers {
+        request_builder = request_builder.header("Anthropic-Beta", beta_headers);
+    }
+
+    let serialized_request =
+        serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
+    let request = request_builder
+        .body(AsyncBody::from(serialized_request))
+        .map_err(AnthropicError::BuildRequestBody)?;
+
+    let mut response = client
+        .send(request)
+        .await
+        .map_err(AnthropicError::HttpSend)?;
+    let rate_limits = RateLimitInfo::from_headers(response.headers());
    if response.status().is_success() {
        let reader = BufReader::new(response.into_body());
        let stream = reader
@@ -700,8 +622,27 @@ pub async fn stream_completion_with_rate_limit_info(
            })
            .boxed();
        Ok((stream, Some(rate_limits)))
+    } else if response.status().as_u16() == 529 {
+        Err(AnthropicError::ServerOverloaded {
+            retry_after: rate_limits.retry_after,
+        })
+    } else if let Some(retry_after) = rate_limits.retry_after {
+        Err(AnthropicError::RateLimit { retry_after })
    } else {
-        Err(handle_error_response(response, rate_limits).await)
+        let mut body = String::new();
+        response
+            .body_mut()
+            .read_to_string(&mut body)
+            .await
+            .map_err(AnthropicError::ReadResponse)?;
+
+        match serde_json::from_str::<Event>(&body) {
+            Ok(Event::Error { error }) => Err(AnthropicError::ApiError(error)),
+            Ok(_) | Err(_) => Err(AnthropicError::HttpResponseError {
+                status_code: response.status(),
+                message: body,
+            }),
+        }
    }
 }

--- a/crates/anthropic/src/batches.rs
+++ b/crates/anthropic/src/batches.rs
@@ -1,190 +0,0 @@
-use anyhow::Result;
-use futures::AsyncReadExt;
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use serde::{Deserialize, Serialize};
-
-use crate::{AnthropicError, ApiError, RateLimitInfo, Request, Response};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BatchRequest {
-    pub custom_id: String,
-    pub params: Request,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CreateBatchRequest {
-    pub requests: Vec<BatchRequest>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MessageBatchRequestCounts {
-    pub processing: u64,
-    pub succeeded: u64,
-    pub errored: u64,
-    pub canceled: u64,
-    pub expired: u64,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MessageBatch {
-    pub id: String,
-    #[serde(rename = "type")]
-    pub batch_type: String,
-    pub processing_status: String,
-    pub request_counts: MessageBatchRequestCounts,
-    pub ended_at: Option<String>,
-    pub created_at: String,
-    pub expires_at: String,
-    pub archived_at: Option<String>,
-    pub cancel_initiated_at: Option<String>,
-    pub results_url: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum BatchResult {
-    #[serde(rename = "succeeded")]
-    Succeeded { message: Response },
-    #[serde(rename = "errored")]
-    Errored { error: ApiError },
-    #[serde(rename = "canceled")]
-    Canceled,
-    #[serde(rename = "expired")]
-    Expired,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BatchIndividualResponse {
-    pub custom_id: String,
-    pub result: BatchResult,
-}
-
-pub async fn create_batch(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: CreateBatchRequest,
-) -> Result<MessageBatch, AnthropicError> {
-    let uri = format!("{api_url}/v1/messages/batches");
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim())
-        .header("Content-Type", "application/json");
-
-    let serialized_request =
-        serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
-    let http_request = request_builder
-        .body(AsyncBody::from(serialized_request))
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let mut response = client
-        .send(http_request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
-    } else {
-        Err(crate::handle_error_response(response, rate_limits).await)
-    }
-}
-
-pub async fn retrieve_batch(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    message_batch_id: &str,
-) -> Result<MessageBatch, AnthropicError> {
-    let uri = format!("{api_url}/v1/messages/batches/{message_batch_id}");
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim());
-
-    let http_request = request_builder
-        .body(AsyncBody::default())
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let mut response = client
-        .send(http_request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
-    } else {
-        Err(crate::handle_error_response(response, rate_limits).await)
-    }
-}
-
-pub async fn retrieve_batch_results(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    message_batch_id: &str,
-) -> Result<Vec<BatchIndividualResponse>, AnthropicError> {
-    let uri = format!("{api_url}/v1/messages/batches/{message_batch_id}/results");
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim());
-
-    let http_request = request_builder
-        .body(AsyncBody::default())
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let mut response = client
-        .send(http_request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        let mut results = Vec::new();
-        for line in body.lines() {
-            if line.trim().is_empty() {
-                continue;
-            }
-            let result: BatchIndividualResponse =
-                serde_json::from_str(line).map_err(AnthropicError::DeserializeResponse)?;
-            results.push(result);
-        }
-
-        Ok(results)
-    } else {
-        Err(crate::handle_error_response(response, rate_limits).await)
-    }
-}
--- a/crates/assistant_text_thread/src/text_thread.rs
+++ b/crates/assistant_text_thread/src/text_thread.rs
@@ -14,7 +14,7 @@ use fs::{Fs, RenameOptions};
 use futures::{FutureExt, StreamExt, future::Shared};
 use gpui::{
    App, AppContext as _, Context, Entity, EventEmitter, RenderImage, SharedString, Subscription,
-    Task, WeakEntity,
+    Task,
 };
 use itertools::Itertools as _;
 use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
@@ -688,7 +688,7 @@ pub struct TextThread {
    _subscriptions: Vec<Subscription>,
    telemetry: Option<Arc<Telemetry>>,
    language_registry: Arc<LanguageRegistry>,
-    project: Option<WeakEntity<Project>>,
+    project: Option<Entity<Project>>,
    prompt_builder: Arc<PromptBuilder>,
    completion_mode: agent_settings::CompletionMode,
 }
@@ -708,7 +708,7 @@ impl EventEmitter<TextThreadEvent> for TextThread {}
 impl TextThread {
    pub fn local(
        language_registry: Arc<LanguageRegistry>,
-        project: Option<WeakEntity<Project>>,
+        project: Option<Entity<Project>>,
        telemetry: Option<Arc<Telemetry>>,
        prompt_builder: Arc<PromptBuilder>,
        slash_commands: Arc<SlashCommandWorkingSet>,
@@ -742,7 +742,7 @@ impl TextThread {
        language_registry: Arc<LanguageRegistry>,
        prompt_builder: Arc<PromptBuilder>,
        slash_commands: Arc<SlashCommandWorkingSet>,
-        project: Option<WeakEntity<Project>>,
+        project: Option<Entity<Project>>,
        telemetry: Option<Arc<Telemetry>>,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -873,7 +873,7 @@ impl TextThread {
        language_registry: Arc<LanguageRegistry>,
        prompt_builder: Arc<PromptBuilder>,
        slash_commands: Arc<SlashCommandWorkingSet>,
-        project: Option<WeakEntity<Project>>,
+        project: Option<Entity<Project>>,
        telemetry: Option<Arc<Telemetry>>,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -1167,6 +1167,10 @@ impl TextThread {
        self.language_registry.clone()
    }

+    pub fn project(&self) -> Option<Entity<Project>> {
+        self.project.clone()
+    }
+
    pub fn prompt_builder(&self) -> Arc<PromptBuilder> {
        self.prompt_builder.clone()
    }
@@ -2963,7 +2967,7 @@ impl TextThread {
    }

    fn update_model_request_usage(&self, amount: u32, limit: UsageLimit, cx: &mut App) {
-        let Some(project) = self.project.as_ref().and_then(|project| project.upgrade()) else {
+        let Some(project) = &self.project else {
            return;
        };
        project.read(cx).user_store().update(cx, |user_store, cx| {
--- a/crates/assistant_text_thread/src/text_thread_store.rs
+++ b/crates/assistant_text_thread/src/text_thread_store.rs
@@ -51,7 +51,7 @@ pub struct TextThreadStore {
    telemetry: Arc<Telemetry>,
    _watch_updates: Task<Option<()>>,
    client: Arc<Client>,
-    project: WeakEntity<Project>,
+    project: Entity<Project>,
    project_is_shared: bool,
    client_subscription: Option<client::Subscription>,
    _project_subscriptions: Vec<gpui::Subscription>,
@@ -119,10 +119,10 @@ impl TextThreadStore {
                    ],
                    project_is_shared: false,
                    client: project.read(cx).client(),
-                    project: project.downgrade(),
+                    project: project.clone(),
                    prompt_builder,
                };
-                this.handle_project_shared(cx);
+                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);
@@ -146,7 +146,7 @@ impl TextThreadStore {
            telemetry: project.read(cx).client().telemetry().clone(),
            _watch_updates: Task::ready(None),
            client: project.read(cx).client(),
-            project: project.downgrade(),
+            project,
            project_is_shared: false,
            client_subscription: None,
            _project_subscriptions: Default::default(),
@@ -180,10 +180,8 @@ impl TextThreadStore {
    ) -> Result<proto::OpenContextResponse> {
        let context_id = TextThreadId::from_proto(envelope.payload.context_id);
        let operations = this.update(&mut cx, |this, cx| {
-            let project = this.project.upgrade().context("project not found")?;
-
            anyhow::ensure!(
-                !project.read(cx).is_via_collab(),
+                !this.project.read(cx).is_via_collab(),
                "only the host contexts can be opened"
            );

@@ -213,9 +211,8 @@ impl TextThreadStore {
        mut cx: AsyncApp,
    ) -> Result<proto::CreateContextResponse> {
        let (context_id, operations) = this.update(&mut cx, |this, cx| {
-            let project = this.project.upgrade().context("project not found")?;
            anyhow::ensure!(
-                !project.read(cx).is_via_collab(),
+                !this.project.read(cx).is_via_collab(),
                "can only create contexts as the host"
            );

@@ -258,9 +255,8 @@ impl TextThreadStore {
        mut cx: AsyncApp,
    ) -> Result<proto::SynchronizeContextsResponse> {
        this.update(&mut cx, |this, cx| {
-            let project = this.project.upgrade().context("project not found")?;
            anyhow::ensure!(
-                !project.read(cx).is_via_collab(),
+                !this.project.read(cx).is_via_collab(),
                "only the host can synchronize contexts"
            );

@@ -297,12 +293,8 @@ impl TextThreadStore {
        })?
    }

-    fn handle_project_shared(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-
-        let is_shared = project.read(cx).is_shared();
+    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 {
            return;
@@ -317,7 +309,7 @@ impl TextThreadStore {
                    false
                }
            });
-            let remote_id = project.read(cx).remote_id().unwrap();
+            let remote_id = self.project.read(cx).remote_id().unwrap();
            self.client_subscription = self
                .client
                .subscribe_to_entity(remote_id)
@@ -331,13 +323,13 @@ impl TextThreadStore {

    fn handle_project_event(
        &mut self,
-        _project: Entity<Project>,
+        project: Entity<Project>,
        event: &project::Event,
        cx: &mut Context<Self>,
    ) {
        match event {
            project::Event::RemoteIdChanged(_) => {
-                self.handle_project_shared(cx);
+                self.handle_project_shared(project, cx);
            }
            project::Event::Reshared => {
                self.advertise_contexts(cx);
@@ -390,10 +382,7 @@ impl TextThreadStore {
    }

    pub fn create_remote(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<TextThread>>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow::anyhow!("project was dropped")));
-        };
-        let project = project.read(cx);
+        let project = self.project.read(cx);
        let Some(project_id) = project.remote_id() else {
            return Task::ready(Err(anyhow::anyhow!("project was not remote")));
        };
@@ -552,10 +541,7 @@ impl TextThreadStore {
        text_thread_id: TextThreadId,
        cx: &mut Context<Self>,
    ) -> Task<Result<Entity<TextThread>>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow::anyhow!("project was dropped")));
-        };
-        let project = project.read(cx);
+        let project = self.project.read(cx);
        let Some(project_id) = project.remote_id() else {
            return Task::ready(Err(anyhow::anyhow!("project was not remote")));
        };
@@ -632,10 +618,7 @@ impl TextThreadStore {
        event: &TextThreadEvent,
        cx: &mut Context<Self>,
    ) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let Some(project_id) = project.read(cx).remote_id() else {
+        let Some(project_id) = self.project.read(cx).remote_id() else {
            return;
        };

@@ -669,14 +652,12 @@ impl TextThreadStore {
    }

    fn advertise_contexts(&self, cx: &App) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let Some(project_id) = project.read(cx).remote_id() else {
+        let Some(project_id) = self.project.read(cx).remote_id() else {
            return;
        };
+
        // For now, only the host can advertise their open contexts.
-        if project.read(cx).is_via_collab() {
+        if self.project.read(cx).is_via_collab() {
            return;
        }

@@ -708,10 +689,7 @@ impl TextThreadStore {
    }

    fn synchronize_contexts(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let Some(project_id) = project.read(cx).remote_id() else {
+        let Some(project_id) = self.project.read(cx).remote_id() else {
            return;
        };

@@ -850,10 +828,7 @@ impl TextThreadStore {
    }

    fn register_context_server_handlers(&self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let context_server_store = project.read(cx).context_server_store();
+        let context_server_store = self.project.read(cx).context_server_store();
        cx.subscribe(&context_server_store, Self::handle_context_server_event)
            .detach();

--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -32,7 +32,7 @@ struct Detect;

 trait InstalledApp {
    fn zed_version_string(&self) -> String;
-    fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()>;
+    fn launch(&self, ipc_url: String) -> anyhow::Result<()>;
    fn run_foreground(
        &self,
        ipc_url: String,
@@ -588,7 +588,7 @@ fn main() -> Result<()> {
    if args.foreground {
        app.run_foreground(url, user_data_dir.as_deref())?;
    } else {
-        app.launch(url, user_data_dir.as_deref())?;
+        app.launch(url)?;
        sender.join().unwrap()?;
        if let Some(handle) = stdin_pipe_handle {
            handle.join().unwrap()?;
@@ -709,18 +709,14 @@ mod linux {
            )
        }

-        fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
-            let data_dir = user_data_dir
-                .map(PathBuf::from)
-                .unwrap_or_else(|| paths::data_dir().clone());
-
-            let sock_path = data_dir.join(format!(
+        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
+            let sock_path = paths::data_dir().join(format!(
                "zed-{}.sock",
                *release_channel::RELEASE_CHANNEL_NAME
            ));
            let sock = UnixDatagram::unbound()?;
            if sock.connect(&sock_path).is_err() {
-                self.boot_background(ipc_url, user_data_dir)?;
+                self.boot_background(ipc_url)?;
            } else {
                sock.send(ipc_url.as_bytes())?;
            }
@@ -746,11 +742,7 @@ mod linux {
    }

    impl App {
-        fn boot_background(
-            &self,
-            ipc_url: String,
-            user_data_dir: Option<&str>,
-        ) -> anyhow::Result<()> {
+        fn boot_background(&self, ipc_url: String) -> anyhow::Result<()> {
            let path = &self.0;

            match fork::fork() {
@@ -764,13 +756,8 @@ mod linux {
                    if fork::close_fd().is_err() {
                        eprintln!("failed to close_fd: {}", std::io::Error::last_os_error());
                    }
-                    let mut args: Vec<OsString> =
-                        vec![path.as_os_str().to_owned(), OsString::from(ipc_url)];
-                    if let Some(dir) = user_data_dir {
-                        args.push(OsString::from("--user-data-dir"));
-                        args.push(OsString::from(dir));
-                    }
-                    let error = exec::execvp(path.clone(), &args);
+                    let error =
+                        exec::execvp(path.clone(), &[path.as_os_str(), &OsString::from(ipc_url)]);
                    // if exec succeeded, we never get here.
                    eprintln!("failed to exec {:?}: {}", path, error);
                    process::exit(1)
@@ -956,14 +943,11 @@ mod windows {
            )
        }

-        fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
+        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
            if check_single_instance() {
-                let mut cmd = std::process::Command::new(self.0.clone());
-                cmd.arg(ipc_url);
-                if let Some(dir) = user_data_dir {
-                    cmd.arg("--user-data-dir").arg(dir);
-                }
-                cmd.spawn()?;
+                std::process::Command::new(self.0.clone())
+                    .arg(ipc_url)
+                    .spawn()?;
            } else {
                unsafe {
                    let pipe = CreateFileW(
@@ -1112,7 +1096,7 @@ mod mac_os {
            format!("Zed {} – {}", self.version(), self.path().display(),)
        }

-        fn launch(&self, url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
+        fn launch(&self, url: String) -> anyhow::Result<()> {
            match self {
                Self::App { app_bundle, .. } => {
                    let app_path = app_bundle;
@@ -1162,11 +1146,8 @@ mod mac_os {
                            format!("Cloning descriptor for file {subprocess_stdout_file:?}")
                        })?;
                    let mut command = std::process::Command::new(executable);
-                    command.env(FORCE_CLI_MODE_ENV_VAR_NAME, "");
-                    if let Some(dir) = user_data_dir {
-                        command.arg("--user-data-dir").arg(dir);
-                    }
-                    command
+                    let command = command
+                        .env(FORCE_CLI_MODE_ENV_VAR_NAME, "")
                        .stderr(subprocess_stdout_file)
                        .stdout(subprocess_stdin_file)
                        .arg(url);
--- a/crates/cloud_llm_client/src/predict_edits_v3.rs
+++ b/crates/cloud_llm_client/src/predict_edits_v3.rs
@@ -31,10 +31,18 @@ pub struct PredictEditsRequest {
    /// Within `signatures`
    pub excerpt_parent: Option<usize>,
    #[serde(skip_serializing_if = "Vec::is_empty", default)]
-    pub related_files: Vec<RelatedFile>,
+    pub included_files: Vec<IncludedFile>,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub signatures: Vec<Signature>,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub referenced_declarations: Vec<ReferencedDeclaration>,
    pub events: Vec<Arc<Event>>,
    #[serde(default)]
    pub can_collect_data: bool,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub diagnostic_groups: Vec<DiagnosticGroup>,
+    #[serde(skip_serializing_if = "is_default", default)]
+    pub diagnostic_groups_truncated: bool,
    /// Info about the git repository state, only present when can_collect_data is true.
    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub git_info: Option<PredictEditsGitInfo>,
@@ -50,7 +58,7 @@ pub struct PredictEditsRequest {
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct RelatedFile {
+pub struct IncludedFile {
    pub path: Arc<Path>,
    pub max_row: Line,
    pub excerpts: Vec<Excerpt>,
@@ -64,9 +72,11 @@ pub struct Excerpt {

 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum PromptFormat {
-    /// XML old_tex/new_text
+    MarkedExcerpt,
+    LabeledSections,
+    NumLinesUniDiff,
    OldTextNewText,
-    /// Prompt format intended for use via edit_prediction_cli
+    /// Prompt format intended for use via zeta_cli
    OnlySnippets,
    /// One-sentence instructions used in fine-tuned models
    Minimal,
@@ -77,7 +87,7 @@ pub enum PromptFormat {
 }

 impl PromptFormat {
-    pub const DEFAULT: PromptFormat = PromptFormat::Minimal;
+    pub const DEFAULT: PromptFormat = PromptFormat::NumLinesUniDiff;
 }

 impl Default for PromptFormat {
@@ -95,7 +105,10 @@ impl PromptFormat {
 impl std::fmt::Display for PromptFormat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match self {
+            PromptFormat::MarkedExcerpt => write!(f, "Marked Excerpt"),
+            PromptFormat::LabeledSections => write!(f, "Labeled Sections"),
            PromptFormat::OnlySnippets => write!(f, "Only Snippets"),
+            PromptFormat::NumLinesUniDiff => write!(f, "Numbered Lines / Unified Diff"),
            PromptFormat::OldTextNewText => write!(f, "Old Text / New Text"),
            PromptFormat::Minimal => write!(f, "Minimal"),
            PromptFormat::MinimalQwen => write!(f, "Minimal + Qwen FIM"),
@@ -165,6 +178,67 @@ impl<'a> std::fmt::Display for DiffPathFmt<'a> {
    }
 }

+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Signature {
+    pub text: String,
+    pub text_is_truncated: bool,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub parent_index: Option<usize>,
+    /// Range of `text` within the file, possibly truncated according to `text_is_truncated`. The
+    /// file is implicitly the file that contains the descendant declaration or excerpt.
+    pub range: Range<Line>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ReferencedDeclaration {
+    pub path: Arc<Path>,
+    pub text: String,
+    pub text_is_truncated: bool,
+    /// Range of `text` within file, possibly truncated according to `text_is_truncated`
+    pub range: Range<Line>,
+    /// Range within `text`
+    pub signature_range: Range<usize>,
+    /// Index within `signatures`.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub parent_index: Option<usize>,
+    pub score_components: DeclarationScoreComponents,
+    pub signature_score: f32,
+    pub declaration_score: f32,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DeclarationScoreComponents {
+    pub is_same_file: bool,
+    pub is_referenced_nearby: bool,
+    pub is_referenced_in_breadcrumb: bool,
+    pub reference_count: usize,
+    pub same_file_declaration_count: usize,
+    pub declaration_count: usize,
+    pub reference_line_distance: u32,
+    pub declaration_line_distance: u32,
+    pub excerpt_vs_item_jaccard: f32,
+    pub excerpt_vs_signature_jaccard: f32,
+    pub adjacent_vs_item_jaccard: f32,
+    pub adjacent_vs_signature_jaccard: f32,
+    pub excerpt_vs_item_weighted_overlap: f32,
+    pub excerpt_vs_signature_weighted_overlap: f32,
+    pub adjacent_vs_item_weighted_overlap: f32,
+    pub adjacent_vs_signature_weighted_overlap: f32,
+    pub path_import_match_count: usize,
+    pub wildcard_path_import_match_count: usize,
+    pub import_similarity: f32,
+    pub max_import_similarity: f32,
+    pub normalized_import_similarity: f32,
+    pub wildcard_import_similarity: f32,
+    pub normalized_wildcard_import_similarity: f32,
+    pub included_by_others: usize,
+    pub includes_others: usize,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct DiagnosticGroup(pub Box<serde_json::value::RawValue>);
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PredictEditsResponse {
    pub request_id: Uuid,
@@ -188,6 +262,10 @@ pub struct Edit {
    pub content: String,
 }

+fn is_default<T: Default + PartialEq>(value: &T) -> bool {
+    *value == T::default()
+}
+
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, PartialOrd, Eq, Ord)]
 pub struct Point {
    pub line: Line,
--- a/crates/cloud_zeta2_prompt/Cargo.toml
+++ b/crates/cloud_zeta2_prompt/Cargo.toml
@@ -15,4 +15,9 @@ path = "src/cloud_zeta2_prompt.rs"
 anyhow.workspace = true
 cloud_llm_client.workspace = true
 indoc.workspace = true
+ordered-float.workspace = true
+rustc-hash.workspace = true
+schemars.workspace = true
 serde.workspace = true
+serde_json.workspace = true
+strum.workspace = true
--- a/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
+++ b/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
@@ -1,12 +1,20 @@
-use anyhow::Result;
+//! Zeta2 prompt planning and generation code shared with cloud.
+pub mod retrieval_prompt;
+
+use anyhow::{Context as _, Result, anyhow};
 use cloud_llm_client::predict_edits_v3::{
-    self, DiffPathFmt, Event, Excerpt, Line, Point, PromptFormat, RelatedFile,
+    self, DiffPathFmt, Event, Excerpt, IncludedFile, Line, Point, PromptFormat,
+    ReferencedDeclaration,
 };
 use indoc::indoc;
+use ordered_float::OrderedFloat;
+use rustc_hash::{FxHashMap, FxHashSet};
+use serde::Serialize;
 use std::cmp;
 use std::fmt::Write;
-use std::path::Path;
 use std::sync::Arc;
+use std::{cmp::Reverse, collections::BinaryHeap, ops::Range, path::Path};
+use strum::{EnumIter, IntoEnumIterator};

 pub const DEFAULT_MAX_PROMPT_BYTES: usize = 10 * 1024;

@@ -16,6 +24,69 @@ pub const EDITABLE_REGION_START_MARKER_WITH_NEWLINE: &str = "<|editable_region_s
 /// NOTE: Differs from zed version of constant - includes a newline
 pub const EDITABLE_REGION_END_MARKER_WITH_NEWLINE: &str = "<|editable_region_end|>\n";

+// TODO: use constants for markers?
+const MARKED_EXCERPT_INSTRUCTIONS: &str = indoc! {"
+    You are a code completion assistant and your task is to analyze user edits and then rewrite an excerpt that the user provides, suggesting the appropriate edits within the excerpt, taking into account the cursor location.
+
+    The excerpt to edit will be wrapped in markers <|editable_region_start|> and <|editable_region_end|>. The cursor position is marked with <|user_cursor|>.  Please respond with edited code for that region.
+
+    Other code is provided for context, and `…` indicates when code has been skipped.
+
+    ## Edit History
+
+"};
+
+const LABELED_SECTIONS_INSTRUCTIONS: &str = indoc! {r#"
+    You are a code completion assistant and your task is to analyze user edits, and suggest an edit to one of the provided sections of code.
+
+    Sections of code are grouped by file and then labeled by `<|section_N|>` (e.g `<|section_8|>`).
+
+    The cursor position is marked with `<|user_cursor|>` and it will appear within a special section labeled `<|current_section|>`. Prefer editing the current section until no more changes are needed within it.
+
+    Respond ONLY with the name of the section to edit on a single line, followed by all of the code that should replace that section. For example:
+
+    <|current_section|>
+    for i in 0..16 {
+        println!("{i}");
+    }
+
+    ## Edit History
+
+"#};
+
+const NUMBERED_LINES_INSTRUCTIONS: &str = indoc! {r#"
+    # Instructions
+
+    You are an edit prediction agent in a code editor.
+    Your job is to predict the next edit that the user will make,
+    based on their last few edits and their current cursor location.
+
+    ## Output Format
+
+    You must briefly explain your understanding of the user's goal, in one
+    or two sentences, and then specify their next edit in the form of a
+    unified diff, like this:
+
+    ```
+    --- a/src/myapp/cli.py
+    +++ b/src/myapp/cli.py
+    @@ ... @@
+     import os
+     import time
+     import sys
+    +from constants import LOG_LEVEL_WARNING
+    @@ ... @@
+     config.headless()
+     config.set_interactive(false)
+    -config.set_log_level(LOG_L)
+    +config.set_log_level(LOG_LEVEL_WARNING)
+     config.set_use_color(True)
+    ```
+
+    ## Edit History
+
+"#};
+
 const STUDENT_MODEL_INSTRUCTIONS: &str = indoc! {r#"
    You are a code completion assistant that analyzes edit history to identify and systematically complete incomplete refactorings or patterns across the entire codebase.

@@ -23,6 +94,20 @@ const STUDENT_MODEL_INSTRUCTIONS: &str = indoc! {r#"

    "#};

+const UNIFIED_DIFF_REMINDER: &str = indoc! {"
+    ---
+
+    Analyze the edit history and the files, then provide the unified diff for your predicted edits.
+    Do not include the cursor marker in your output.
+    Your diff should include edited file paths in its file headers (lines beginning with `---` and `+++`).
+    Do not include line numbers in the hunk headers, use `@@ ... @@`.
+    Removed lines begin with `-`.
+    Added lines begin with `+`.
+    Context lines begin with an extra space.
+    Context and removed lines are used to match the target edit location, so make sure to include enough of them
+    to uniquely identify it amongst all excerpts of code provided.
+"};
+
 const MINIMAL_PROMPT_REMINDER: &str = indoc! {"
    ---

@@ -79,25 +164,49 @@ const OLD_TEXT_NEW_TEXT_REMINDER: &str = indoc! {r#"
    Remember that the edits in the edit history have already been applied.
 "#};

-pub fn build_prompt(request: &predict_edits_v3::PredictEditsRequest) -> Result<String> {
+pub fn build_prompt(
+    request: &predict_edits_v3::PredictEditsRequest,
+) -> Result<(String, SectionLabels)> {
+    let mut section_labels = Default::default();
+
    let prompt_data = PromptData {
        events: request.events.clone(),
        cursor_point: request.cursor_point,
        cursor_path: request.excerpt_path.clone(),
-        included_files: request.related_files.clone(),
+        included_files: request.included_files.clone(),
    };
    match request.prompt_format {
        PromptFormat::MinimalQwen => {
-            return Ok(MinimalQwenPrompt.render(&prompt_data));
+            return Ok((MinimalQwenPrompt.render(&prompt_data), section_labels));
        }
        PromptFormat::SeedCoder1120 => {
-            return Ok(SeedCoder1120Prompt.render(&prompt_data));
+            return Ok((SeedCoder1120Prompt.render(&prompt_data), section_labels));
        }
        _ => (),
    };

-    let insertions = match request.prompt_format {
-        PromptFormat::Minimal | PromptFormat::OldTextNewText => {
+    let mut insertions = match request.prompt_format {
+        PromptFormat::MarkedExcerpt => vec![
+            (
+                Point {
+                    line: request.excerpt_line_range.start,
+                    column: 0,
+                },
+                EDITABLE_REGION_START_MARKER_WITH_NEWLINE,
+            ),
+            (request.cursor_point, CURSOR_MARKER),
+            (
+                Point {
+                    line: request.excerpt_line_range.end,
+                    column: 0,
+                },
+                EDITABLE_REGION_END_MARKER_WITH_NEWLINE,
+            ),
+        ],
+        PromptFormat::LabeledSections
+        | PromptFormat::NumLinesUniDiff
+        | PromptFormat::Minimal
+        | PromptFormat::OldTextNewText => {
            vec![(request.cursor_point, CURSOR_MARKER)]
        }
        PromptFormat::OnlySnippets => vec![],
@@ -106,6 +215,9 @@ pub fn build_prompt(request: &predict_edits_v3::PredictEditsRequest) -> Result<S
    };

    let mut prompt = match request.prompt_format {
+        PromptFormat::MarkedExcerpt => MARKED_EXCERPT_INSTRUCTIONS.to_string(),
+        PromptFormat::LabeledSections => LABELED_SECTIONS_INSTRUCTIONS.to_string(),
+        PromptFormat::NumLinesUniDiff => NUMBERED_LINES_INSTRUCTIONS.to_string(),
        PromptFormat::OldTextNewText => XML_TAGS_INSTRUCTIONS.to_string(),
        PromptFormat::OnlySnippets => String::new(),
        PromptFormat::Minimal => STUDENT_MODEL_INSTRUCTIONS.to_string(),
@@ -135,7 +247,7 @@ pub fn build_prompt(request: &predict_edits_v3::PredictEditsRequest) -> Result<S
             You can only edit exactly this part of the file.
             We prepend line numbers (e.g., `123|<actual line>`); they are not part of the file.)
             "},
-        PromptFormat::OldTextNewText => indoc! {"
+        PromptFormat::NumLinesUniDiff | PromptFormat::OldTextNewText => indoc! {"
            ## Code Excerpts

            Here is some excerpts of code that you should take into account to predict the next edit.
@@ -151,51 +263,64 @@ pub fn build_prompt(request: &predict_edits_v3::PredictEditsRequest) -> Result<S

            Lines starting with `…` indicate omitted line ranges. These may appear inside multi-line code constructs.
        "},
-        PromptFormat::OnlySnippets | PromptFormat::MinimalQwen | PromptFormat::SeedCoder1120 => {
-            indoc! {"
+        _ => indoc! {"
            ## Code Excerpts

            The cursor marker <|user_cursor|> indicates the current user cursor position.
            The file is in current state, edits from edit history have been applied.
-        "}
-        }
+        "},
    };

    prompt.push_str(excerpts_preamble);
    prompt.push('\n');

-    let include_line_numbers = matches!(request.prompt_format, PromptFormat::Minimal);
-    for related_file in &request.related_files {
-        if request.prompt_format == PromptFormat::Minimal {
-            write_codeblock_with_filename(
-                &related_file.path,
-                &related_file.excerpts,
-                if related_file.path == request.excerpt_path {
-                    &insertions
-                } else {
-                    &[]
-                },
-                related_file.max_row,
-                include_line_numbers,
-                &mut prompt,
-            );
-        } else {
-            write_codeblock(
-                &related_file.path,
-                &related_file.excerpts,
-                if related_file.path == request.excerpt_path {
-                    &insertions
-                } else {
-                    &[]
-                },
-                related_file.max_row,
-                include_line_numbers,
-                &mut prompt,
-            );
+    if !request.referenced_declarations.is_empty() || !request.signatures.is_empty() {
+        let syntax_based_prompt = SyntaxBasedPrompt::populate(request)?;
+        section_labels = syntax_based_prompt.write(&mut insertions, &mut prompt)?;
+    } else {
+        if request.prompt_format == PromptFormat::LabeledSections {
+            anyhow::bail!("PromptFormat::LabeledSections cannot be used with ContextMode::Llm");
+        }
+
+        let include_line_numbers = matches!(
+            request.prompt_format,
+            PromptFormat::NumLinesUniDiff | PromptFormat::Minimal
+        );
+        for related_file in &request.included_files {
+            if request.prompt_format == PromptFormat::Minimal {
+                write_codeblock_with_filename(
+                    &related_file.path,
+                    &related_file.excerpts,
+                    if related_file.path == request.excerpt_path {
+                        &insertions
+                    } else {
+                        &[]
+                    },
+                    related_file.max_row,
+                    include_line_numbers,
+                    &mut prompt,
+                );
+            } else {
+                write_codeblock(
+                    &related_file.path,
+                    &related_file.excerpts,
+                    if related_file.path == request.excerpt_path {
+                        &insertions
+                    } else {
+                        &[]
+                    },
+                    related_file.max_row,
+                    include_line_numbers,
+                    &mut prompt,
+                );
+            }
        }
    }

    match request.prompt_format {
+        PromptFormat::NumLinesUniDiff => {
+            prompt.push_str(UNIFIED_DIFF_REMINDER);
+        }
        PromptFormat::OldTextNewText => {
            prompt.push_str(OLD_TEXT_NEW_TEXT_REMINDER);
        }
@@ -205,7 +330,7 @@ pub fn build_prompt(request: &predict_edits_v3::PredictEditsRequest) -> Result<S
        _ => {}
    }

-    Ok(prompt)
+    Ok((prompt, section_labels))
 }

 pub fn generation_params(prompt_format: PromptFormat) -> GenerationParams {
@@ -319,11 +444,476 @@ pub fn push_events(output: &mut String, events: &[Arc<predict_edits_v3::Event>])
    writeln!(output, "`````\n").unwrap();
 }

+pub struct SyntaxBasedPrompt<'a> {
+    request: &'a predict_edits_v3::PredictEditsRequest,
+    /// Snippets to include in the prompt. These may overlap - they are merged / deduplicated in
+    /// `to_prompt_string`.
+    snippets: Vec<PlannedSnippet<'a>>,
+    budget_used: usize,
+}
+
+#[derive(Clone, Debug)]
+pub struct PlannedSnippet<'a> {
+    path: Arc<Path>,
+    range: Range<Line>,
+    text: &'a str,
+    // TODO: Indicate this in the output
+    #[allow(dead_code)]
+    text_is_truncated: bool,
+}
+
+#[derive(EnumIter, Clone, Copy, PartialEq, Eq, Hash, Debug, PartialOrd, Ord)]
+pub enum DeclarationStyle {
+    Signature,
+    Declaration,
+}
+
+#[derive(Default, Clone, Debug, Serialize)]
+pub struct SectionLabels {
+    pub excerpt_index: usize,
+    pub section_ranges: Vec<(Arc<Path>, Range<Line>)>,
+}
+
+impl<'a> SyntaxBasedPrompt<'a> {
+    /// Greedy one-pass knapsack algorithm to populate the prompt plan. Does the following:
+    ///
+    /// Initializes a priority queue by populating it with each snippet, finding the
+    /// DeclarationStyle that minimizes `score_density = score / snippet.range(style).len()`. When a
+    /// "signature" snippet is popped, insert an entry for the "declaration" variant that reflects
+    /// the cost of upgrade.
+    ///
+    /// TODO: Implement an early halting condition. One option might be to have another priority
+    /// queue where the score is the size, and update it accordingly. Another option might be to
+    /// have some simpler heuristic like bailing after N failed insertions, or based on how much
+    /// budget is left.
+    ///
+    /// TODO: Has the current known sources of imprecision:
+    ///
+    /// * Does not consider snippet overlap when ranking. For example, it might add a field to the
+    /// plan even though the containing struct is already included.
+    ///
+    /// * Does not consider cost of signatures when ranking snippets - this is tricky since
+    /// signatures may be shared by multiple snippets.
+    ///
+    /// * Does not include file paths / other text when considering max_bytes.
+    pub fn populate(request: &'a predict_edits_v3::PredictEditsRequest) -> Result<Self> {
+        let mut this = Self {
+            request,
+            snippets: Vec::new(),
+            budget_used: request.excerpt.len(),
+        };
+        let mut included_parents = FxHashSet::default();
+        let additional_parents = this.additional_parent_signatures(
+            &request.excerpt_path,
+            request.excerpt_parent,
+            &included_parents,
+        )?;
+        this.add_parents(&mut included_parents, additional_parents);
+
+        let max_bytes = request.prompt_max_bytes.unwrap_or(DEFAULT_MAX_PROMPT_BYTES);
+
+        if this.budget_used > max_bytes {
+            return Err(anyhow!(
+                "Excerpt + signatures size of {} already exceeds budget of {}",
+                this.budget_used,
+                max_bytes
+            ));
+        }
+
+        #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+        struct QueueEntry {
+            score_density: OrderedFloat<f32>,
+            declaration_index: usize,
+            style: DeclarationStyle,
+        }
+
+        // Initialize priority queue with the best score for each snippet.
+        let mut queue: BinaryHeap<QueueEntry> = BinaryHeap::new();
+        for (declaration_index, declaration) in request.referenced_declarations.iter().enumerate() {
+            let (style, score_density) = DeclarationStyle::iter()
+                .map(|style| {
+                    (
+                        style,
+                        OrderedFloat(declaration_score_density(&declaration, style)),
+                    )
+                })
+                .max_by_key(|(_, score_density)| *score_density)
+                .unwrap();
+            queue.push(QueueEntry {
+                score_density,
+                declaration_index,
+                style,
+            });
+        }
+
+        // Knapsack selection loop
+        while let Some(queue_entry) = queue.pop() {
+            let Some(declaration) = request
+                .referenced_declarations
+                .get(queue_entry.declaration_index)
+            else {
+                return Err(anyhow!(
+                    "Invalid declaration index {}",
+                    queue_entry.declaration_index
+                ));
+            };
+
+            let mut additional_bytes = declaration_size(declaration, queue_entry.style);
+            if this.budget_used + additional_bytes > max_bytes {
+                continue;
+            }
+
+            let additional_parents = this.additional_parent_signatures(
+                &declaration.path,
+                declaration.parent_index,
+                &mut included_parents,
+            )?;
+            additional_bytes += additional_parents
+                .iter()
+                .map(|(_, snippet)| snippet.text.len())
+                .sum::<usize>();
+            if this.budget_used + additional_bytes > max_bytes {
+                continue;
+            }
+
+            this.budget_used += additional_bytes;
+            this.add_parents(&mut included_parents, additional_parents);
+            let planned_snippet = match queue_entry.style {
+                DeclarationStyle::Signature => {
+                    let Some(text) = declaration.text.get(declaration.signature_range.clone())
+                    else {
+                        return Err(anyhow!(
+                            "Invalid declaration signature_range {:?} with text.len() = {}",
+                            declaration.signature_range,
+                            declaration.text.len()
+                        ));
+                    };
+                    let signature_start_line = declaration.range.start
+                        + Line(
+                            declaration.text[..declaration.signature_range.start]
+                                .lines()
+                                .count() as u32,
+                        );
+                    let signature_end_line = signature_start_line
+                        + Line(
+                            declaration.text
+                                [declaration.signature_range.start..declaration.signature_range.end]
+                                .lines()
+                                .count() as u32,
+                        );
+                    let range = signature_start_line..signature_end_line;
+
+                    PlannedSnippet {
+                        path: declaration.path.clone(),
+                        range,
+                        text,
+                        text_is_truncated: declaration.text_is_truncated,
+                    }
+                }
+                DeclarationStyle::Declaration => PlannedSnippet {
+                    path: declaration.path.clone(),
+                    range: declaration.range.clone(),
+                    text: &declaration.text,
+                    text_is_truncated: declaration.text_is_truncated,
+                },
+            };
+            this.snippets.push(planned_snippet);
+
+            // When a Signature is consumed, insert an entry for Definition style.
+            if queue_entry.style == DeclarationStyle::Signature {
+                let signature_size = declaration_size(&declaration, DeclarationStyle::Signature);
+                let declaration_size =
+                    declaration_size(&declaration, DeclarationStyle::Declaration);
+                let signature_score = declaration_score(&declaration, DeclarationStyle::Signature);
+                let declaration_score =
+                    declaration_score(&declaration, DeclarationStyle::Declaration);
+
+                let score_diff = declaration_score - signature_score;
+                let size_diff = declaration_size.saturating_sub(signature_size);
+                if score_diff > 0.0001 && size_diff > 0 {
+                    queue.push(QueueEntry {
+                        declaration_index: queue_entry.declaration_index,
+                        score_density: OrderedFloat(score_diff / (size_diff as f32)),
+                        style: DeclarationStyle::Declaration,
+                    });
+                }
+            }
+        }
+
+        anyhow::Ok(this)
+    }
+
+    fn add_parents(
+        &mut self,
+        included_parents: &mut FxHashSet<usize>,
+        snippets: Vec<(usize, PlannedSnippet<'a>)>,
+    ) {
+        for (parent_index, snippet) in snippets {
+            included_parents.insert(parent_index);
+            self.budget_used += snippet.text.len();
+            self.snippets.push(snippet);
+        }
+    }
+
+    fn additional_parent_signatures(
+        &self,
+        path: &Arc<Path>,
+        parent_index: Option<usize>,
+        included_parents: &FxHashSet<usize>,
+    ) -> Result<Vec<(usize, PlannedSnippet<'a>)>> {
+        let mut results = Vec::new();
+        self.additional_parent_signatures_impl(path, parent_index, included_parents, &mut results)?;
+        Ok(results)
+    }
+
+    fn additional_parent_signatures_impl(
+        &self,
+        path: &Arc<Path>,
+        parent_index: Option<usize>,
+        included_parents: &FxHashSet<usize>,
+        results: &mut Vec<(usize, PlannedSnippet<'a>)>,
+    ) -> Result<()> {
+        let Some(parent_index) = parent_index else {
+            return Ok(());
+        };
+        if included_parents.contains(&parent_index) {
+            return Ok(());
+        }
+        let Some(parent_signature) = self.request.signatures.get(parent_index) else {
+            return Err(anyhow!("Invalid parent index {}", parent_index));
+        };
+        results.push((
+            parent_index,
+            PlannedSnippet {
+                path: path.clone(),
+                range: parent_signature.range.clone(),
+                text: &parent_signature.text,
+                text_is_truncated: parent_signature.text_is_truncated,
+            },
+        ));
+        self.additional_parent_signatures_impl(
+            path,
+            parent_signature.parent_index,
+            included_parents,
+            results,
+        )
+    }
+
+    /// Renders the planned context. Each file starts with "```FILE_PATH\n` and ends with triple
+    /// backticks, with a newline after each file. Outputs a line with "..." between nonconsecutive
+    /// chunks.
+    pub fn write(
+        &'a self,
+        excerpt_file_insertions: &mut Vec<(Point, &'static str)>,
+        prompt: &mut String,
+    ) -> Result<SectionLabels> {
+        let mut file_to_snippets: FxHashMap<&'a std::path::Path, Vec<&PlannedSnippet<'a>>> =
+            FxHashMap::default();
+        for snippet in &self.snippets {
+            file_to_snippets
+                .entry(&snippet.path)
+                .or_default()
+                .push(snippet);
+        }
+
+        // Reorder so that file with cursor comes last
+        let mut file_snippets = Vec::new();
+        let mut excerpt_file_snippets = Vec::new();
+        for (file_path, snippets) in file_to_snippets {
+            if file_path == self.request.excerpt_path.as_ref() {
+                excerpt_file_snippets = snippets;
+            } else {
+                file_snippets.push((file_path, snippets, false));
+            }
+        }
+        let excerpt_snippet = PlannedSnippet {
+            path: self.request.excerpt_path.clone(),
+            range: self.request.excerpt_line_range.clone(),
+            text: &self.request.excerpt,
+            text_is_truncated: false,
+        };
+        excerpt_file_snippets.push(&excerpt_snippet);
+        file_snippets.push((&self.request.excerpt_path, excerpt_file_snippets, true));
+
+        let section_labels =
+            self.push_file_snippets(prompt, excerpt_file_insertions, file_snippets)?;
+
+        Ok(section_labels)
+    }
+
+    fn push_file_snippets(
+        &self,
+        output: &mut String,
+        excerpt_file_insertions: &mut Vec<(Point, &'static str)>,
+        file_snippets: Vec<(&'a Path, Vec<&'a PlannedSnippet>, bool)>,
+    ) -> Result<SectionLabels> {
+        let mut section_ranges = Vec::new();
+        let mut excerpt_index = None;
+
+        for (file_path, mut snippets, is_excerpt_file) in file_snippets {
+            snippets.sort_by_key(|s| (s.range.start, Reverse(s.range.end)));
+
+            // TODO: What if the snippets get expanded too large to be editable?
+            let mut current_snippet: Option<(&PlannedSnippet, Range<Line>)> = None;
+            let mut disjoint_snippets: Vec<(&PlannedSnippet, Range<Line>)> = Vec::new();
+            for snippet in snippets {
+                if let Some((_, current_snippet_range)) = current_snippet.as_mut()
+                    && snippet.range.start <= current_snippet_range.end
+                {
+                    current_snippet_range.end = current_snippet_range.end.max(snippet.range.end);
+                    continue;
+                }
+                if let Some(current_snippet) = current_snippet.take() {
+                    disjoint_snippets.push(current_snippet);
+                }
+                current_snippet = Some((snippet, snippet.range.clone()));
+            }
+            if let Some(current_snippet) = current_snippet.take() {
+                disjoint_snippets.push(current_snippet);
+            }
+
+            writeln!(output, "`````path={}", file_path.display()).ok();
+            let mut skipped_last_snippet = false;
+            for (snippet, range) in disjoint_snippets {
+                let section_index = section_ranges.len();
+
+                match self.request.prompt_format {
+                    PromptFormat::MarkedExcerpt
+                    | PromptFormat::OnlySnippets
+                    | PromptFormat::OldTextNewText
+                    | PromptFormat::Minimal
+                    | PromptFormat::NumLinesUniDiff => {
+                        if range.start.0 > 0 && !skipped_last_snippet {
+                            output.push_str("…\n");
+                        }
+                    }
+                    PromptFormat::LabeledSections => {
+                        if is_excerpt_file
+                            && range.start <= self.request.excerpt_line_range.start
+                            && range.end >= self.request.excerpt_line_range.end
+                        {
+                            writeln!(output, "<|current_section|>").ok();
+                        } else {
+                            writeln!(output, "<|section_{}|>", section_index).ok();
+                        }
+                    }
+                    PromptFormat::MinimalQwen => unreachable!(),
+                    PromptFormat::SeedCoder1120 => unreachable!(),
+                }
+
+                let push_full_snippet = |output: &mut String| {
+                    if self.request.prompt_format == PromptFormat::NumLinesUniDiff {
+                        for (i, line) in snippet.text.lines().enumerate() {
+                            writeln!(output, "{}|{}", i as u32 + range.start.0 + 1, line)?;
+                        }
+                    } else {
+                        output.push_str(&snippet.text);
+                    }
+                    anyhow::Ok(())
+                };
+
+                if is_excerpt_file {
+                    if self.request.prompt_format == PromptFormat::OnlySnippets {
+                        if range.start >= self.request.excerpt_line_range.start
+                            && range.end <= self.request.excerpt_line_range.end
+                        {
+                            skipped_last_snippet = true;
+                        } else {
+                            skipped_last_snippet = false;
+                            output.push_str(snippet.text);
+                        }
+                    } else if !excerpt_file_insertions.is_empty() {
+                        let lines = snippet.text.lines().collect::<Vec<_>>();
+                        let push_line = |output: &mut String, line_ix: usize| {
+                            if self.request.prompt_format == PromptFormat::NumLinesUniDiff {
+                                write!(output, "{}|", line_ix as u32 + range.start.0 + 1)?;
+                            }
+                            anyhow::Ok(writeln!(output, "{}", lines[line_ix])?)
+                        };
+                        let mut last_line_ix = 0;
+                        let mut insertion_ix = 0;
+                        while insertion_ix < excerpt_file_insertions.len() {
+                            let (point, insertion) = &excerpt_file_insertions[insertion_ix];
+                            let found = point.line >= range.start && point.line <= range.end;
+                            if found {
+                                excerpt_index = Some(section_index);
+                                let insertion_line_ix = (point.line.0 - range.start.0) as usize;
+                                for line_ix in last_line_ix..insertion_line_ix {
+                                    push_line(output, line_ix)?;
+                                }
+                                if let Some(next_line) = lines.get(insertion_line_ix) {
+                                    if self.request.prompt_format == PromptFormat::NumLinesUniDiff {
+                                        write!(
+                                            output,
+                                            "{}|",
+                                            insertion_line_ix as u32 + range.start.0 + 1
+                                        )?
+                                    }
+                                    output.push_str(&next_line[..point.column as usize]);
+                                    output.push_str(insertion);
+                                    writeln!(output, "{}", &next_line[point.column as usize..])?;
+                                } else {
+                                    writeln!(output, "{}", insertion)?;
+                                }
+                                last_line_ix = insertion_line_ix + 1;
+                                excerpt_file_insertions.remove(insertion_ix);
+                                continue;
+                            }
+                            insertion_ix += 1;
+                        }
+                        skipped_last_snippet = false;
+                        for line_ix in last_line_ix..lines.len() {
+                            push_line(output, line_ix)?;
+                        }
+                    } else {
+                        skipped_last_snippet = false;
+                        push_full_snippet(output)?;
+                    }
+                } else {
+                    skipped_last_snippet = false;
+                    push_full_snippet(output)?;
+                }
+
+                section_ranges.push((snippet.path.clone(), range));
+            }
+
+            output.push_str("`````\n\n");
+        }
+
+        Ok(SectionLabels {
+            // TODO: Clean this up
+            excerpt_index: match self.request.prompt_format {
+                PromptFormat::OnlySnippets => 0,
+                _ => excerpt_index.context("bug: no snippet found for excerpt")?,
+            },
+            section_ranges,
+        })
+    }
+}
+
+fn declaration_score_density(declaration: &ReferencedDeclaration, style: DeclarationStyle) -> f32 {
+    declaration_score(declaration, style) / declaration_size(declaration, style) as f32
+}
+
+fn declaration_score(declaration: &ReferencedDeclaration, style: DeclarationStyle) -> f32 {
+    match style {
+        DeclarationStyle::Signature => declaration.signature_score,
+        DeclarationStyle::Declaration => declaration.declaration_score,
+    }
+}
+
+fn declaration_size(declaration: &ReferencedDeclaration, style: DeclarationStyle) -> usize {
+    match style {
+        DeclarationStyle::Signature => declaration.signature_range.len(),
+        DeclarationStyle::Declaration => declaration.text.len(),
+    }
+}
+
 struct PromptData {
    events: Vec<Arc<Event>>,
    cursor_point: Point,
    cursor_path: Arc<Path>, // TODO: make a common struct with cursor_point
-    included_files: Vec<RelatedFile>,
+    included_files: Vec<IncludedFile>,
 }

 #[derive(Default)]
@@ -461,7 +1051,7 @@ impl SeedCoder1120Prompt {
        context
    }

-    fn fmt_fim(&self, file: &RelatedFile, cursor_point: Point) -> String {
+    fn fmt_fim(&self, file: &IncludedFile, cursor_point: Point) -> String {
        let mut buf = String::new();
        const FIM_SUFFIX: &str = "<[fim-suffix]>";
        const FIM_PREFIX: &str = "<[fim-prefix]>";
--- a/crates/cloud_zeta2_prompt/src/retrieval_prompt.rs
+++ b/crates/cloud_zeta2_prompt/src/retrieval_prompt.rs
@@ -0,0 +1,244 @@
+use anyhow::Result;
+use cloud_llm_client::predict_edits_v3::{self, Excerpt};
+use indoc::indoc;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::fmt::Write;
+
+use crate::{push_events, write_codeblock};
+
+pub fn build_prompt(request: predict_edits_v3::PlanContextRetrievalRequest) -> Result<String> {
+    let mut prompt = SEARCH_INSTRUCTIONS.to_string();
+
+    if !request.events.is_empty() {
+        writeln!(&mut prompt, "\n## User Edits\n\n")?;
+        push_events(&mut prompt, &request.events);
+    }
+
+    writeln!(&mut prompt, "## Cursor context\n")?;
+    write_codeblock(
+        &request.excerpt_path,
+        &[Excerpt {
+            start_line: request.excerpt_line_range.start,
+            text: request.excerpt.into(),
+        }],
+        &[],
+        request.cursor_file_max_row,
+        true,
+        &mut prompt,
+    );
+
+    writeln!(&mut prompt, "{TOOL_USE_REMINDER}")?;
+
+    Ok(prompt)
+}
+
+/// Search for relevant code
+///
+/// For the best results, run multiple queries at once with a single invocation of this tool.
+#[derive(Clone, Deserialize, Serialize, JsonSchema)]
+pub struct SearchToolInput {
+    /// An array of queries to run for gathering context relevant to the next prediction
+    #[schemars(length(max = 3))]
+    #[serde(deserialize_with = "deserialize_queries")]
+    pub queries: Box<[SearchToolQuery]>,
+}
+
+fn deserialize_queries<'de, D>(deserializer: D) -> Result<Box<[SearchToolQuery]>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::de::Error;
+
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum QueryCollection {
+        Array(Box<[SearchToolQuery]>),
+        DoubleArray(Box<[Box<[SearchToolQuery]>]>),
+        Single(SearchToolQuery),
+    }
+
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum MaybeDoubleEncoded {
+        SingleEncoded(QueryCollection),
+        DoubleEncoded(String),
+    }
+
+    let result = MaybeDoubleEncoded::deserialize(deserializer)?;
+
+    let normalized = match result {
+        MaybeDoubleEncoded::SingleEncoded(value) => value,
+        MaybeDoubleEncoded::DoubleEncoded(value) => {
+            serde_json::from_str(&value).map_err(D::Error::custom)?
+        }
+    };
+
+    Ok(match normalized {
+        QueryCollection::Array(items) => items,
+        QueryCollection::Single(search_tool_query) => Box::new([search_tool_query]),
+        QueryCollection::DoubleArray(double_array) => double_array.into_iter().flatten().collect(),
+    })
+}
+
+/// Search for relevant code by path, syntax hierarchy, and content.
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, Hash)]
+pub struct SearchToolQuery {
+    /// 1. A glob pattern to match file paths in the codebase to search in.
+    pub glob: String,
+    /// 2. Regular expressions to match syntax nodes **by their first line** and hierarchy.
+    ///
+    /// Subsequent regexes match nodes within the full content of the nodes matched by the previous regexes.
+    ///
+    /// Example: Searching for a `User` class
+    ///     ["class\s+User"]
+    ///
+    /// Example: Searching for a `get_full_name` method under a `User` class
+    ///     ["class\s+User", "def\sget_full_name"]
+    ///
+    /// Skip this field to match on content alone.
+    #[schemars(length(max = 3))]
+    #[serde(default)]
+    pub syntax_node: Vec<String>,
+    /// 3. An optional regular expression to match the final content that should appear in the results.
+    ///
+    /// - Content will be matched within all lines of the matched syntax nodes.
+    /// - If syntax node regexes are provided, this field can be skipped to include as much of the node itself as possible.
+    /// - If no syntax node regexes are provided, the content will be matched within the entire file.
+    pub content: Option<String>,
+}
+
+pub const TOOL_NAME: &str = "search";
+
+const SEARCH_INSTRUCTIONS: &str = indoc! {r#"
+    You are part of an edit prediction system in a code editor.
+    Your role is to search for code that will serve as context for predicting the next edit.
+
+    - Analyze the user's recent edits and current cursor context
+    - Use the `search` tool to find code that is relevant for predicting the next edit
+    - Focus on finding:
+       - Code patterns that might need similar changes based on the recent edits
+       - Functions, variables, types, and constants referenced in the current cursor context
+       - Related implementations, usages, or dependencies that may require consistent updates
+       - How items defined in the cursor excerpt are used or altered
+    - You will not be able to filter results or perform subsequent queries, so keep searches as targeted as possible
+    - Use `syntax_node` parameter whenever you're looking for a particular type, class, or function
+    - Avoid using wildcard globs if you already know the file path of the content you're looking for
+"#};
+
+const TOOL_USE_REMINDER: &str = indoc! {"
+    --
+    Analyze the user's intent in one to two sentences, then call the `search` tool.
+"};
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use super::*;
+
+    #[test]
+    fn test_deserialize_queries() {
+        let single_query_json = indoc! {r#"{
+            "queries": {
+                "glob": "**/*.rs",
+                "syntax_node": ["fn test"],
+                "content": "assert"
+            }
+        }"#};
+
+        let flat_input: SearchToolInput = serde_json::from_str(single_query_json).unwrap();
+        assert_eq!(flat_input.queries.len(), 1);
+        assert_eq!(flat_input.queries[0].glob, "**/*.rs");
+        assert_eq!(flat_input.queries[0].syntax_node, vec!["fn test"]);
+        assert_eq!(flat_input.queries[0].content, Some("assert".to_string()));
+
+        let flat_json = indoc! {r#"{
+            "queries": [
+                {
+                    "glob": "**/*.rs",
+                    "syntax_node": ["fn test"],
+                    "content": "assert"
+                },
+                {
+                    "glob": "**/*.ts",
+                    "syntax_node": [],
+                    "content": null
+                }
+            ]
+        }"#};
+
+        let flat_input: SearchToolInput = serde_json::from_str(flat_json).unwrap();
+        assert_eq!(flat_input.queries.len(), 2);
+        assert_eq!(flat_input.queries[0].glob, "**/*.rs");
+        assert_eq!(flat_input.queries[0].syntax_node, vec!["fn test"]);
+        assert_eq!(flat_input.queries[0].content, Some("assert".to_string()));
+        assert_eq!(flat_input.queries[1].glob, "**/*.ts");
+        assert_eq!(flat_input.queries[1].syntax_node.len(), 0);
+        assert_eq!(flat_input.queries[1].content, None);
+
+        let nested_json = indoc! {r#"{
+            "queries": [
+                [
+                    {
+                        "glob": "**/*.rs",
+                        "syntax_node": ["fn test"],
+                        "content": "assert"
+                    }
+                ],
+                [
+                    {
+                        "glob": "**/*.ts",
+                        "syntax_node": [],
+                        "content": null
+                    }
+                ]
+            ]
+        }"#};
+
+        let nested_input: SearchToolInput = serde_json::from_str(nested_json).unwrap();
+
+        assert_eq!(nested_input.queries.len(), 2);
+
+        assert_eq!(nested_input.queries[0].glob, "**/*.rs");
+        assert_eq!(nested_input.queries[0].syntax_node, vec!["fn test"]);
+        assert_eq!(nested_input.queries[0].content, Some("assert".to_string()));
+        assert_eq!(nested_input.queries[1].glob, "**/*.ts");
+        assert_eq!(nested_input.queries[1].syntax_node.len(), 0);
+        assert_eq!(nested_input.queries[1].content, None);
+
+        let double_encoded_queries = serde_json::to_string(&json!({
+            "queries": serde_json::to_string(&json!([
+                {
+                    "glob": "**/*.rs",
+                    "syntax_node": ["fn test"],
+                    "content": "assert"
+                },
+                {
+                    "glob": "**/*.ts",
+                    "syntax_node": [],
+                    "content": null
+                }
+            ])).unwrap()
+        }))
+        .unwrap();
+
+        let double_encoded_input: SearchToolInput =
+            serde_json::from_str(&double_encoded_queries).unwrap();
+
+        assert_eq!(double_encoded_input.queries.len(), 2);
+
+        assert_eq!(double_encoded_input.queries[0].glob, "**/*.rs");
+        assert_eq!(double_encoded_input.queries[0].syntax_node, vec!["fn test"]);
+        assert_eq!(
+            double_encoded_input.queries[0].content,
+            Some("assert".to_string())
+        );
+        assert_eq!(double_encoded_input.queries[1].glob, "**/*.ts");
+        assert_eq!(double_encoded_input.queries[1].syntax_node.len(), 0);
+        assert_eq!(double_encoded_input.queries[1].content, None);
+
+        // ### ERROR Switching from var declarations to lexical declarations [RUN 073]
+        // invalid search json {"queries": ["express/lib/response.js", "var\\s+[a-zA-Z_][a-zA-Z0-9_]*\\s*=.*;", "function.*\\(.*\\).*\\{.*\\}"]}
+    }
+}
--- a/crates/codestral/Cargo.toml
+++ b/crates/codestral/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/codestral.rs"

 [dependencies]
 anyhow.workspace = true
-edit_prediction_types.workspace = true
+edit_prediction.workspace = true
 edit_prediction_context.workspace = true
 futures.workspace = true
 gpui.workspace = true
--- a/crates/codestral/src/codestral.rs
+++ b/crates/codestral/src/codestral.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context as _, Result};
+use edit_prediction::{Direction, EditPrediction, EditPredictionProvider};
 use edit_prediction_context::{EditPredictionExcerpt, EditPredictionExcerptOptions};
-use edit_prediction_types::{Direction, EditPrediction, EditPredictionDelegate};
 use futures::AsyncReadExt;
 use gpui::{App, Context, Entity, Task};
 use http_client::HttpClient;
@@ -43,17 +43,17 @@ impl CurrentCompletion {
    /// Attempts to adjust the edits based on changes made to the buffer since the completion was generated.
    /// Returns None if the user's edits conflict with the predicted edits.
    fn interpolate(&self, new_snapshot: &BufferSnapshot) -> Option<Vec<(Range<Anchor>, Arc<str>)>> {
-        edit_prediction_types::interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
+        edit_prediction::interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
    }
 }

-pub struct CodestralEditPredictionDelegate {
+pub struct CodestralCompletionProvider {
    http_client: Arc<dyn HttpClient>,
    pending_request: Option<Task<Result<()>>>,
    current_completion: Option<CurrentCompletion>,
 }

-impl CodestralEditPredictionDelegate {
+impl CodestralCompletionProvider {
    pub fn new(http_client: Arc<dyn HttpClient>) -> Self {
        Self {
            http_client,
@@ -165,7 +165,7 @@ impl CodestralEditPredictionDelegate {
    }
 }

-impl EditPredictionDelegate for CodestralEditPredictionDelegate {
+impl EditPredictionProvider for CodestralCompletionProvider {
    fn name() -> &'static str {
        "codestral"
    }
@@ -174,7 +174,7 @@ impl EditPredictionDelegate for CodestralEditPredictionDelegate {
        "Codestral"
    }

-    fn show_predictions_in_menu() -> bool {
+    fn show_completions_in_menu() -> bool {
        true
    }

@@ -239,6 +239,7 @@ impl EditPredictionDelegate for CodestralEditPredictionDelegate {
                cursor_point,
                &snapshot,
                &EXCERPT_OPTIONS,
+                None,
            )
            .context("Line containing cursor doesn't fit in excerpt max bytes")?;

--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -65,7 +65,7 @@ tokio = { workspace = true, features = ["full"] }
 toml.workspace = true
 tower = "0.4"
 tower-http = { workspace = true, features = ["trace"] }
-tracing.workspace = true
+tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
 util.workspace = true
 uuid.workspace = true
--- a/crates/collab/README.md
+++ b/crates/collab/README.md
@@ -63,3 +63,15 @@ Deployment is triggered by pushing to the `collab-staging` (or `collab-productio
 - `./script/deploy-collab production`

 You can tell what is currently deployed with `./script/what-is-deployed`.
+
+# Database Migrations
+
+To create a new migration:
+
+```sh
+./script/create-migration <name>
+```
+
+Migrations are run automatically on service start, so run `foreman start` again. The service will crash if the migrations fail.
+
+When you create a new migration, you also need to update the [SQLite schema](./migrations.sqlite/20221109000000_test_schema.sql) that is used for testing.
--- a/crates/collab/k8s/migrate.template.yml
+++ b/crates/collab/k8s/migrate.template.yml
@@ -0,0 +1,21 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  namespace: ${ZED_KUBE_NAMESPACE}
+  name: ${ZED_MIGRATE_JOB_NAME}
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: migrator
+          imagePullPolicy: Always
+          image: ${ZED_IMAGE_ID}
+          args:
+            - migrate
+          env:
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: database
+                  key: url
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -121,8 +121,6 @@ CREATE TABLE "project_repositories" (
    "merge_message" VARCHAR,
    "branch_summary" VARCHAR,
    "head_commit_details" VARCHAR,
-    "remote_upstream_url" VARCHAR,
-    "remote_origin_url" VARCHAR,
    PRIMARY KEY (project_id, id)
 );

--- a/crates/collab/migrations/20210527024318_initial_schema.sql
+++ b/crates/collab/migrations/20210527024318_initial_schema.sql
@@ -0,0 +1,20 @@
+CREATE TABLE IF NOT EXISTS "sessions" (
+    "id" VARCHAR NOT NULL PRIMARY KEY,
+    "expires" TIMESTAMP WITH TIME ZONE NULL,
+    "session" TEXT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "users" (
+    "id" SERIAL PRIMARY KEY,
+    "github_login" VARCHAR,
+    "admin" BOOLEAN
+);
+
+CREATE UNIQUE INDEX "index_users_github_login" ON "users" ("github_login");
+
+CREATE TABLE IF NOT EXISTS "signups" (
+    "id" SERIAL PRIMARY KEY,
+    "github_login" VARCHAR,
+    "email_address" VARCHAR,
+    "about" TEXT
+);
--- a/crates/collab/migrations/20210607190313_create_access_tokens.sql
+++ b/crates/collab/migrations/20210607190313_create_access_tokens.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS "access_tokens" (
+    "id" SERIAL PRIMARY KEY,
+    "user_id" INTEGER REFERENCES users (id),
+    "hash" VARCHAR(128)
+);
+
+CREATE INDEX "index_access_tokens_user_id" ON "access_tokens" ("user_id");
--- a/crates/collab/migrations/20210805175147_create_chat_tables.sql
+++ b/crates/collab/migrations/20210805175147_create_chat_tables.sql
@@ -0,0 +1,46 @@
+CREATE TABLE IF NOT EXISTS "orgs" (
+    "id" SERIAL PRIMARY KEY,
+    "name" VARCHAR NOT NULL,
+    "slug" VARCHAR NOT NULL
+);
+
+CREATE UNIQUE INDEX "index_orgs_slug" ON "orgs" ("slug");
+
+CREATE TABLE IF NOT EXISTS "org_memberships" (
+    "id" SERIAL PRIMARY KEY,
+    "org_id" INTEGER REFERENCES orgs (id) NOT NULL,
+    "user_id" INTEGER REFERENCES users (id) NOT NULL,
+    "admin" BOOLEAN NOT NULL
+);
+
+CREATE INDEX "index_org_memberships_user_id" ON "org_memberships" ("user_id");
+CREATE UNIQUE INDEX "index_org_memberships_org_id_and_user_id" ON "org_memberships" ("org_id", "user_id");
+
+CREATE TABLE IF NOT EXISTS "channels" (
+    "id" SERIAL PRIMARY KEY,
+    "owner_id" INTEGER NOT NULL,
+    "owner_is_user" BOOLEAN NOT NULL,
+    "name" VARCHAR NOT NULL
+);
+
+CREATE UNIQUE INDEX "index_channels_owner_and_name" ON "channels" ("owner_is_user", "owner_id", "name");
+
+CREATE TABLE IF NOT EXISTS "channel_memberships" (
+    "id" SERIAL PRIMARY KEY,
+    "channel_id" INTEGER REFERENCES channels (id) NOT NULL,
+    "user_id" INTEGER REFERENCES users (id) NOT NULL,
+    "admin" BOOLEAN NOT NULL
+);
+
+CREATE INDEX "index_channel_memberships_user_id" ON "channel_memberships" ("user_id");
+CREATE UNIQUE INDEX "index_channel_memberships_channel_id_and_user_id" ON "channel_memberships" ("channel_id", "user_id");
+
+CREATE TABLE IF NOT EXISTS "channel_messages" (
+    "id" SERIAL PRIMARY KEY,
+    "channel_id" INTEGER REFERENCES channels (id) NOT NULL,
+    "sender_id" INTEGER REFERENCES users (id) NOT NULL,
+    "body" TEXT NOT NULL,
+    "sent_at" TIMESTAMP
+);
+
+CREATE INDEX "index_channel_messages_channel_id" ON "channel_messages" ("channel_id");
--- a/crates/collab/migrations/20210916123647_add_nonce_to_channel_messages.sql
+++ b/crates/collab/migrations/20210916123647_add_nonce_to_channel_messages.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "channel_messages"
+ADD "nonce" UUID NOT NULL DEFAULT gen_random_uuid();
+
+CREATE UNIQUE INDEX "index_channel_messages_nonce" ON "channel_messages" ("nonce");
--- a/crates/collab/migrations/20210920192001_add_interests_to_signups.sql
+++ b/crates/collab/migrations/20210920192001_add_interests_to_signups.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "signups"
+  ADD "wants_releases" BOOLEAN,
+  ADD "wants_updates" BOOLEAN,
+  ADD "wants_community" BOOLEAN;
--- a/crates/collab/migrations/20220421165757_drop_signups.sql
+++ b/crates/collab/migrations/20220421165757_drop_signups.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS "signups";
--- a/crates/collab/migrations/20220505144506_add_trigram_index_to_users.sql
+++ b/crates/collab/migrations/20220505144506_add_trigram_index_to_users.sql
@@ -0,0 +1,2 @@
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+CREATE INDEX trigram_index_users_on_github_login ON users USING GIN(github_login gin_trgm_ops);
--- a/crates/collab/migrations/20220506130724_create_contacts.sql
+++ b/crates/collab/migrations/20220506130724_create_contacts.sql
@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS "contacts" (
+    "id" SERIAL PRIMARY KEY,
+    "user_id_a" INTEGER REFERENCES users (id) NOT NULL,
+    "user_id_b" INTEGER REFERENCES users (id) NOT NULL,
+    "a_to_b" BOOLEAN NOT NULL,
+    "should_notify" BOOLEAN NOT NULL,
+    "accepted" BOOLEAN NOT NULL
+);
+
+CREATE UNIQUE INDEX "index_contacts_user_ids" ON "contacts" ("user_id_a", "user_id_b");
+CREATE INDEX "index_contacts_user_id_b" ON "contacts" ("user_id_b");
--- a/crates/collab/migrations/20220518151305_add_invites_to_users.sql
+++ b/crates/collab/migrations/20220518151305_add_invites_to_users.sql
@@ -0,0 +1,9 @@
+ALTER TABLE users
+ADD email_address VARCHAR(255) DEFAULT NULL,
+ADD invite_code VARCHAR(64),
+ADD invite_count INTEGER NOT NULL DEFAULT 0,
+ADD inviter_id INTEGER REFERENCES users (id),
+ADD connected_once BOOLEAN NOT NULL DEFAULT false,
+ADD created_at TIMESTAMP NOT NULL DEFAULT NOW();
+
+CREATE UNIQUE INDEX "index_invite_code_users" ON "users" ("invite_code");
--- a/crates/collab/migrations/20220523232954_allow_user_deletes.sql
+++ b/crates/collab/migrations/20220523232954_allow_user_deletes.sql
@@ -0,0 +1,6 @@
+ALTER TABLE contacts DROP CONSTRAINT contacts_user_id_a_fkey;
+ALTER TABLE contacts DROP CONSTRAINT contacts_user_id_b_fkey;
+ALTER TABLE contacts ADD CONSTRAINT contacts_user_id_a_fkey FOREIGN KEY (user_id_a) REFERENCES users(id) ON DELETE CASCADE;
+ALTER TABLE contacts ADD CONSTRAINT contacts_user_id_b_fkey FOREIGN KEY (user_id_b) REFERENCES users(id) ON DELETE CASCADE;
+ALTER TABLE users DROP CONSTRAINT users_inviter_id_fkey;
+ALTER TABLE users ADD CONSTRAINT users_inviter_id_fkey FOREIGN KEY (inviter_id) REFERENCES users(id) ON DELETE SET NULL;
--- a/crates/collab/migrations/20220620211403_create_projects.sql
+++ b/crates/collab/migrations/20220620211403_create_projects.sql
@@ -0,0 +1,24 @@
+CREATE TABLE IF NOT EXISTS "projects" (
+    "id" SERIAL PRIMARY KEY,
+    "host_user_id" INTEGER REFERENCES users (id) NOT NULL,
+    "unregistered" BOOLEAN NOT NULL DEFAULT false
+);
+
+CREATE TABLE IF NOT EXISTS "worktree_extensions" (
+    "id" SERIAL PRIMARY KEY,
+    "project_id" INTEGER REFERENCES projects (id) NOT NULL,
+    "worktree_id" INTEGER NOT NULL,
+    "extension" VARCHAR(255),
+    "count" INTEGER NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "project_activity_periods" (
+    "id" SERIAL PRIMARY KEY,
+    "duration_millis" INTEGER NOT NULL,
+    "ended_at" TIMESTAMP NOT NULL,
+    "user_id" INTEGER REFERENCES users (id) NOT NULL,
+    "project_id" INTEGER REFERENCES projects (id) NOT NULL
+);
+
+CREATE INDEX "index_project_activity_periods_on_ended_at" ON "project_activity_periods" ("ended_at");
+CREATE UNIQUE INDEX "index_worktree_extensions_on_project_id_and_worktree_id_and_extension" ON "worktree_extensions" ("project_id", "worktree_id", "extension");
--- a/crates/collab/migrations/20220913211150_create_signups.sql
+++ b/crates/collab/migrations/20220913211150_create_signups.sql
@@ -0,0 +1,27 @@
+CREATE TABLE IF NOT EXISTS "signups" (
+    "id" SERIAL PRIMARY KEY,
+    "email_address" VARCHAR NOT NULL,
+    "email_confirmation_code" VARCHAR(64) NOT NULL,
+    "email_confirmation_sent" BOOLEAN NOT NULL,
+    "created_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "device_id" VARCHAR,
+    "user_id" INTEGER REFERENCES users (id) ON DELETE CASCADE,
+    "inviting_user_id" INTEGER REFERENCES users (id) ON DELETE SET NULL,
+
+    "platform_mac" BOOLEAN NOT NULL,
+    "platform_linux" BOOLEAN NOT NULL,
+    "platform_windows" BOOLEAN NOT NULL,
+    "platform_unknown" BOOLEAN NOT NULL,
+
+    "editor_features" VARCHAR[],
+    "programming_languages" VARCHAR[]
+);
+
+CREATE UNIQUE INDEX "index_signups_on_email_address" ON "signups" ("email_address");
+CREATE INDEX "index_signups_on_email_confirmation_sent" ON "signups" ("email_confirmation_sent");
+
+ALTER TABLE "users"
+    ADD "github_user_id" INTEGER;
+
+CREATE INDEX "index_users_on_email_address" ON "users" ("email_address");
+CREATE INDEX "index_users_on_github_user_id" ON "users" ("github_user_id");
--- a/crates/collab/migrations/20220929182110_add_metrics_id.sql
+++ b/crates/collab/migrations/20220929182110_add_metrics_id.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "users"
+    ADD "metrics_id" uuid NOT NULL DEFAULT gen_random_uuid();
--- a/crates/collab/migrations/20221111092550_reconnection_support.sql
+++ b/crates/collab/migrations/20221111092550_reconnection_support.sql
@@ -0,0 +1,90 @@
+CREATE TABLE IF NOT EXISTS "rooms" (
+    "id" SERIAL PRIMARY KEY,
+    "live_kit_room" VARCHAR NOT NULL
+);
+
+ALTER TABLE "projects"
+    ADD "room_id" INTEGER REFERENCES rooms (id),
+    ADD "host_connection_id" INTEGER,
+    ADD "host_connection_epoch" UUID;
+CREATE INDEX "index_projects_on_host_connection_epoch" ON "projects" ("host_connection_epoch");
+
+CREATE TABLE "worktrees" (
+    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
+    "id" INT8 NOT NULL,
+    "root_name" VARCHAR NOT NULL,
+    "abs_path" VARCHAR NOT NULL,
+    "visible" BOOL NOT NULL,
+    "scan_id" INT8 NOT NULL,
+    "is_complete" BOOL NOT NULL,
+    PRIMARY KEY(project_id, id)
+);
+CREATE INDEX "index_worktrees_on_project_id" ON "worktrees" ("project_id");
+
+CREATE TABLE "worktree_entries" (
+    "project_id" INTEGER NOT NULL,
+    "worktree_id" INT8 NOT NULL,
+    "id" INT8 NOT NULL,
+    "is_dir" BOOL NOT NULL,
+    "path" VARCHAR NOT NULL,
+    "inode" INT8 NOT NULL,
+    "mtime_seconds" INT8 NOT NULL,
+    "mtime_nanos" INTEGER NOT NULL,
+    "is_symlink" BOOL NOT NULL,
+    "is_ignored" BOOL NOT NULL,
+    PRIMARY KEY(project_id, worktree_id, id),
+    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE
+);
+CREATE INDEX "index_worktree_entries_on_project_id" ON "worktree_entries" ("project_id");
+CREATE INDEX "index_worktree_entries_on_project_id_and_worktree_id" ON "worktree_entries" ("project_id", "worktree_id");
+
+CREATE TABLE "worktree_diagnostic_summaries" (
+    "project_id" INTEGER NOT NULL,
+    "worktree_id" INT8 NOT NULL,
+    "path" VARCHAR NOT NULL,
+    "language_server_id" INT8 NOT NULL,
+    "error_count" INTEGER NOT NULL,
+    "warning_count" INTEGER NOT NULL,
+    PRIMARY KEY(project_id, worktree_id, path),
+    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE
+);
+CREATE INDEX "index_worktree_diagnostic_summaries_on_project_id" ON "worktree_diagnostic_summaries" ("project_id");
+CREATE INDEX "index_worktree_diagnostic_summaries_on_project_id_and_worktree_id" ON "worktree_diagnostic_summaries" ("project_id", "worktree_id");
+
+CREATE TABLE "language_servers" (
+    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
+    "id" INT8 NOT NULL,
+    "name" VARCHAR NOT NULL,
+    PRIMARY KEY(project_id, id)
+);
+CREATE INDEX "index_language_servers_on_project_id" ON "language_servers" ("project_id");
+
+CREATE TABLE "project_collaborators" (
+    "id" SERIAL PRIMARY KEY,
+    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
+    "connection_id" INTEGER NOT NULL,
+    "connection_epoch" UUID NOT NULL,
+    "user_id" INTEGER NOT NULL,
+    "replica_id" INTEGER NOT NULL,
+    "is_host" BOOLEAN NOT NULL
+);
+CREATE INDEX "index_project_collaborators_on_project_id" ON "project_collaborators" ("project_id");
+CREATE UNIQUE INDEX "index_project_collaborators_on_project_id_and_replica_id" ON "project_collaborators" ("project_id", "replica_id");
+CREATE INDEX "index_project_collaborators_on_connection_epoch" ON "project_collaborators" ("connection_epoch");
+
+CREATE TABLE "room_participants" (
+    "id" SERIAL PRIMARY KEY,
+    "room_id" INTEGER NOT NULL REFERENCES rooms (id),
+    "user_id" INTEGER NOT NULL REFERENCES users (id),
+    "answering_connection_id" INTEGER,
+    "answering_connection_epoch" UUID,
+    "location_kind" INTEGER,
+    "location_project_id" INTEGER,
+    "initial_project_id" INTEGER,
+    "calling_user_id" INTEGER NOT NULL REFERENCES users (id),
+    "calling_connection_id" INTEGER NOT NULL,
+    "calling_connection_epoch" UUID NOT NULL
+);
+CREATE UNIQUE INDEX "index_room_participants_on_user_id" ON "room_participants" ("user_id");
+CREATE INDEX "index_room_participants_on_answering_connection_epoch" ON "room_participants" ("answering_connection_epoch");
+CREATE INDEX "index_room_participants_on_calling_connection_epoch" ON "room_participants" ("calling_connection_epoch");
--- a/crates/collab/migrations/20221125192125_add_added_to_mailing_list_to_signups.sql
+++ b/crates/collab/migrations/20221125192125_add_added_to_mailing_list_to_signups.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "signups"
+    ADD "added_to_mailing_list" BOOLEAN NOT NULL DEFAULT FALSE;
--- a/crates/collab/migrations/20221207165001_add_connection_lost_to_room_participants.sql
+++ b/crates/collab/migrations/20221207165001_add_connection_lost_to_room_participants.sql
@@ -0,0 +1,7 @@
+ALTER TABLE "room_participants"
+    ADD "answering_connection_lost" BOOLEAN NOT NULL DEFAULT FALSE;
+
+CREATE INDEX "index_project_collaborators_on_connection_id" ON "project_collaborators" ("connection_id");
+CREATE UNIQUE INDEX "index_project_collaborators_on_project_id_connection_id_and_epoch" ON "project_collaborators" ("project_id", "connection_id", "connection_epoch");
+CREATE INDEX "index_room_participants_on_answering_connection_id" ON "room_participants" ("answering_connection_id");
+CREATE UNIQUE INDEX "index_room_participants_on_answering_connection_id_and_answering_connection_epoch" ON "room_participants" ("answering_connection_id", "answering_connection_epoch");
--- a/crates/collab/migrations/20221213125710_index_room_participants_on_room_id.sql
+++ b/crates/collab/migrations/20221213125710_index_room_participants_on_room_id.sql
@@ -0,0 +1 @@
+CREATE INDEX "index_room_participants_on_room_id" ON "room_participants" ("room_id");
--- a/crates/collab/migrations/20221214144346_change_epoch_from_uuid_to_integer.sql
+++ b/crates/collab/migrations/20221214144346_change_epoch_from_uuid_to_integer.sql
@@ -0,0 +1,30 @@
+CREATE TABLE servers (
+    id SERIAL PRIMARY KEY,
+    environment VARCHAR NOT NULL
+);
+
+DROP TABLE worktree_extensions;
+DROP TABLE project_activity_periods;
+DELETE from projects;
+ALTER TABLE projects
+    DROP COLUMN host_connection_epoch,
+    ADD COLUMN host_connection_server_id INTEGER REFERENCES servers (id) ON DELETE CASCADE;
+CREATE INDEX "index_projects_on_host_connection_server_id" ON "projects" ("host_connection_server_id");
+CREATE INDEX "index_projects_on_host_connection_id_and_host_connection_server_id" ON "projects" ("host_connection_id", "host_connection_server_id");
+
+DELETE FROM project_collaborators;
+ALTER TABLE project_collaborators
+    DROP COLUMN connection_epoch,
+    ADD COLUMN connection_server_id INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE;
+CREATE INDEX "index_project_collaborators_on_connection_server_id" ON "project_collaborators" ("connection_server_id");
+CREATE UNIQUE INDEX "index_project_collaborators_on_project_id_connection_id_and_server_id" ON "project_collaborators" ("project_id", "connection_id", "connection_server_id");
+
+DELETE FROM room_participants;
+ALTER TABLE room_participants
+    DROP COLUMN answering_connection_epoch,
+    DROP COLUMN calling_connection_epoch,
+    ADD COLUMN answering_connection_server_id INTEGER REFERENCES servers (id) ON DELETE CASCADE,
+    ADD COLUMN calling_connection_server_id INTEGER REFERENCES servers (id) ON DELETE SET NULL;
+CREATE INDEX "index_room_participants_on_answering_connection_server_id" ON "room_participants" ("answering_connection_server_id");
+CREATE INDEX "index_room_participants_on_calling_connection_server_id" ON "room_participants" ("calling_connection_server_id");
+CREATE UNIQUE INDEX "index_room_participants_on_answering_connection_id_and_answering_connection_server_id" ON "room_participants" ("answering_connection_id", "answering_connection_server_id");
--- a/crates/collab/migrations/20221219181850_project_reconnection_support.sql
+++ b/crates/collab/migrations/20221219181850_project_reconnection_support.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "worktree_entries"
+    ADD COLUMN "scan_id" INT8,
+    ADD COLUMN "is_deleted" BOOL;
--- a/crates/collab/migrations/20230103200902_replace_is_completed_with_completed_scan_id.sql
+++ b/crates/collab/migrations/20230103200902_replace_is_completed_with_completed_scan_id.sql
@@ -0,0 +1,3 @@
+ALTER TABLE worktrees
+    ALTER COLUMN is_complete SET DEFAULT FALSE,
+    ADD COLUMN completed_scan_id INT8;
--- a/crates/collab/migrations/20230202155735_followers.sql
+++ b/crates/collab/migrations/20230202155735_followers.sql
@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS "followers" (
+    "id" SERIAL PRIMARY KEY,
+    "room_id" INTEGER NOT NULL REFERENCES rooms (id) ON DELETE CASCADE,
+    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
+    "leader_connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
+    "leader_connection_id" INTEGER NOT NULL,
+    "follower_connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
+    "follower_connection_id" INTEGER NOT NULL
+);
+
+CREATE UNIQUE INDEX 
+    "index_followers_on_project_id_and_leader_connection_server_id_and_leader_connection_id_and_follower_connection_server_id_and_follower_connection_id"
+ON "followers" ("project_id", "leader_connection_server_id", "leader_connection_id", "follower_connection_server_id", "follower_connection_id");
+
+CREATE INDEX "index_followers_on_room_id" ON "followers" ("room_id");
--- a/crates/collab/migrations/20230508211523_add-repository-entries.sql
+++ b/crates/collab/migrations/20230508211523_add-repository-entries.sql
@@ -0,0 +1,13 @@
+CREATE TABLE "worktree_repositories" (
+    "project_id" INTEGER NOT NULL,
+    "worktree_id" INT8 NOT NULL,
+    "work_directory_id" INT8 NOT NULL,
+    "scan_id" INT8 NOT NULL,
+    "branch" VARCHAR,
+    "is_deleted" BOOL NOT NULL,
+    PRIMARY KEY(project_id, worktree_id, work_directory_id),
+    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
+    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
+);
+CREATE INDEX "index_worktree_repositories_on_project_id" ON "worktree_repositories" ("project_id");
+CREATE INDEX "index_worktree_repositories_on_project_id_and_worktree_id" ON "worktree_repositories" ("project_id", "worktree_id");
--- a/crates/collab/migrations/20230511004019_add_repository_statuses.sql
+++ b/crates/collab/migrations/20230511004019_add_repository_statuses.sql
@@ -0,0 +1,15 @@
+CREATE TABLE "worktree_repository_statuses" (
+    "project_id" INTEGER NOT NULL,
+    "worktree_id" INT8 NOT NULL,
+    "work_directory_id" INT8 NOT NULL,
+    "repo_path" VARCHAR NOT NULL,
+    "status" INT8 NOT NULL,
+    "scan_id" INT8 NOT NULL,
+    "is_deleted" BOOL NOT NULL,
+    PRIMARY KEY(project_id, worktree_id, work_directory_id, repo_path),
+    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
+    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
+);
+CREATE INDEX "index_wt_repos_statuses_on_project_id" ON "worktree_repository_statuses" ("project_id");
+CREATE INDEX "index_wt_repos_statuses_on_project_id_and_wt_id" ON "worktree_repository_statuses" ("project_id", "worktree_id");
+CREATE INDEX "index_wt_repos_statuses_on_project_id_and_wt_id_and_wd_id" ON "worktree_repository_statuses" ("project_id", "worktree_id", "work_directory_id");
--- a/crates/collab/migrations/20230529164700_add_worktree_settings_files.sql
+++ b/crates/collab/migrations/20230529164700_add_worktree_settings_files.sql
@@ -0,0 +1,10 @@
+CREATE TABLE "worktree_settings_files" (
+    "project_id" INTEGER NOT NULL,
+    "worktree_id" INT8 NOT NULL,
+    "path" VARCHAR NOT NULL,
+    "content" TEXT NOT NULL,
+    PRIMARY KEY(project_id, worktree_id, path),
+    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE
+);
+CREATE INDEX "index_settings_files_on_project_id" ON "worktree_settings_files" ("project_id");
+CREATE INDEX "index_settings_files_on_project_id_and_wt_id" ON "worktree_settings_files" ("project_id", "worktree_id");
--- a/crates/collab/migrations/20230605191135_remove_repository_statuses.sql
+++ b/crates/collab/migrations/20230605191135_remove_repository_statuses.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "worktree_entries"
+ADD "git_status" INT8;
--- a/crates/collab/migrations/20230616134535_add_is_external_to_worktree_entries.sql
+++ b/crates/collab/migrations/20230616134535_add_is_external_to_worktree_entries.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "worktree_entries"
+ADD "is_external" BOOL NOT NULL DEFAULT FALSE;
--- a/crates/collab/migrations/20230727150500_add_channels.sql
+++ b/crates/collab/migrations/20230727150500_add_channels.sql
@@ -0,0 +1,30 @@
+DROP TABLE "channel_messages";
+DROP TABLE "channel_memberships";
+DROP TABLE "org_memberships";
+DROP TABLE "orgs";
+DROP TABLE "channels";
+
+CREATE TABLE "channels" (
+    "id" SERIAL PRIMARY KEY,
+    "name" VARCHAR NOT NULL,
+    "created_at" TIMESTAMP NOT NULL DEFAULT now()
+);
+
+CREATE TABLE "channel_paths" (
+    "id_path" VARCHAR NOT NULL PRIMARY KEY,
+    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE
+);
+CREATE INDEX "index_channel_paths_on_channel_id" ON "channel_paths" ("channel_id");
+
+CREATE TABLE "channel_members" (
+    "id" SERIAL PRIMARY KEY,
+    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+    "admin" BOOLEAN NOT NULL DEFAULT false,
+    "accepted" BOOLEAN NOT NULL DEFAULT false,
+    "updated_at" TIMESTAMP NOT NULL DEFAULT now()
+);
+
+CREATE UNIQUE INDEX "index_channel_members_on_channel_id_and_user_id" ON "channel_members" ("channel_id", "user_id");
+
+ALTER TABLE rooms ADD COLUMN "channel_id" INTEGER REFERENCES channels (id) ON DELETE CASCADE;
--- a/crates/collab/migrations/20230819154600_add_channel_buffers.sql
+++ b/crates/collab/migrations/20230819154600_add_channel_buffers.sql
@@ -0,0 +1,40 @@
+CREATE TABLE "buffers" (
+    "id" SERIAL PRIMARY KEY,
+    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+    "epoch" INTEGER NOT NULL DEFAULT 0
+);
+
+CREATE INDEX "index_buffers_on_channel_id" ON "buffers" ("channel_id");
+
+CREATE TABLE "buffer_operations" (
+    "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
+    "epoch" INTEGER NOT NULL,
+    "replica_id" INTEGER NOT NULL,
+    "lamport_timestamp" INTEGER NOT NULL,
+    "value" BYTEA NOT NULL,
+    PRIMARY KEY(buffer_id, epoch, lamport_timestamp, replica_id)
+);
+
+CREATE TABLE "buffer_snapshots" (
+    "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
+    "epoch" INTEGER NOT NULL,
+    "text" TEXT NOT NULL,
+    "operation_serialization_version" INTEGER NOT NULL,
+    PRIMARY KEY(buffer_id, epoch)
+);
+
+CREATE TABLE "channel_buffer_collaborators" (
+    "id" SERIAL PRIMARY KEY,
+    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+    "connection_id" INTEGER NOT NULL,
+    "connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
+    "connection_lost" BOOLEAN NOT NULL DEFAULT FALSE,
+    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+    "replica_id" INTEGER NOT NULL
+);
+
+CREATE INDEX "index_channel_buffer_collaborators_on_channel_id" ON "channel_buffer_collaborators" ("channel_id");
+CREATE UNIQUE INDEX "index_channel_buffer_collaborators_on_channel_id_and_replica_id" ON "channel_buffer_collaborators" ("channel_id", "replica_id");
+CREATE INDEX "index_channel_buffer_collaborators_on_connection_server_id" ON "channel_buffer_collaborators" ("connection_server_id");
+CREATE INDEX "index_channel_buffer_collaborators_on_connection_id" ON "channel_buffer_collaborators" ("connection_id");
+CREATE UNIQUE INDEX "index_channel_buffer_collaborators_on_channel_id_connection_id_and_server_id" ON "channel_buffer_collaborators" ("channel_id", "connection_id", "connection_server_id");
--- a/crates/collab/migrations/20230825190322_add_server_feature_flags.sql
+++ b/crates/collab/migrations/20230825190322_add_server_feature_flags.sql
@@ -0,0 +1,16 @@
+CREATE TABLE "feature_flags" (
+    "id" SERIAL PRIMARY KEY,
+    "flag" VARCHAR(255) NOT NULL UNIQUE
+);
+
+CREATE UNIQUE INDEX "index_feature_flags" ON "feature_flags" ("id");
+
+CREATE TABLE "user_features" (
+    "user_id" INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    "feature_id" INTEGER NOT NULL REFERENCES feature_flags(id) ON DELETE CASCADE,
+    PRIMARY KEY (user_id, feature_id)
+);
+
+CREATE UNIQUE INDEX "index_user_features_user_id_and_feature_id" ON "user_features" ("user_id", "feature_id");
+CREATE INDEX "index_user_features_on_user_id" ON "user_features" ("user_id");
+CREATE INDEX "index_user_features_on_feature_id" ON "user_features" ("feature_id");
--- a/crates/collab/migrations/20230907114200_add_channel_messages.sql
+++ b/crates/collab/migrations/20230907114200_add_channel_messages.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS "channel_messages" (
+    "id" SERIAL PRIMARY KEY,
+    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+    "sender_id" INTEGER NOT NULL REFERENCES users (id),
+    "body" TEXT NOT NULL,
+    "sent_at" TIMESTAMP,
+    "nonce" UUID NOT NULL
+);
+CREATE INDEX "index_channel_messages_on_channel_id" ON "channel_messages" ("channel_id");
+CREATE UNIQUE INDEX "index_channel_messages_on_nonce" ON "channel_messages" ("nonce");
+
+CREATE TABLE IF NOT EXISTS "channel_chat_participants" (
+    "id" SERIAL PRIMARY KEY,
+    "user_id" INTEGER NOT NULL REFERENCES users (id),
+    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+    "connection_id" INTEGER NOT NULL,
+    "connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE
+);
+CREATE INDEX "index_channel_chat_participants_on_channel_id" ON "channel_chat_participants" ("channel_id");
--- a/crates/collab/migrations/20230925210437_add_channel_changes.sql
+++ b/crates/collab/migrations/20230925210437_add_channel_changes.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS "observed_buffer_edits" (
+    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+    "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
+    "epoch" INTEGER NOT NULL,
+    "lamport_timestamp" INTEGER NOT NULL,
+    "replica_id" INTEGER NOT NULL,
+    PRIMARY KEY (user_id, buffer_id)
+);
+
+CREATE UNIQUE INDEX "index_observed_buffer_user_and_buffer_id" ON "observed_buffer_edits" ("user_id", "buffer_id");
+
+CREATE TABLE IF NOT EXISTS "observed_channel_messages" (
+    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+    "channel_message_id" INTEGER NOT NULL,
+    PRIMARY KEY (user_id, channel_id)
+);
+
+CREATE UNIQUE INDEX "index_observed_channel_messages_user_and_channel_id" ON "observed_channel_messages" ("user_id", "channel_id");
--- a/crates/collab/migrations/20230926102500_add_participant_index_to_room_participants.sql
+++ b/crates/collab/migrations/20230926102500_add_participant_index_to_room_participants.sql
@@ -0,0 +1 @@
+ALTER TABLE room_participants ADD COLUMN participant_index INTEGER;
--- a/crates/collab/migrations/20231004130100_create_notifications.sql
+++ b/crates/collab/migrations/20231004130100_create_notifications.sql
@@ -0,0 +1,22 @@
+CREATE TABLE "notification_kinds" (
+    "id" SERIAL PRIMARY KEY,
+    "name" VARCHAR NOT NULL
+);
+
+CREATE UNIQUE INDEX "index_notification_kinds_on_name" ON "notification_kinds" ("name");
+
+CREATE TABLE notifications (
+    "id" SERIAL PRIMARY KEY,
+    "created_at" TIMESTAMP NOT NULL DEFAULT now(),
+    "recipient_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+    "kind" INTEGER NOT NULL REFERENCES notification_kinds (id),
+    "entity_id" INTEGER,
+    "content" TEXT,
+    "is_read" BOOLEAN NOT NULL DEFAULT FALSE,
+    "response" BOOLEAN
+);
+
+CREATE INDEX
+    "index_notifications_on_recipient_id_is_read_kind_entity_id"
+    ON "notifications"
+    ("recipient_id", "is_read", "kind", "entity_id");
--- a/crates/collab/migrations/20231009181554_add_release_channel_to_rooms.sql
+++ b/crates/collab/migrations/20231009181554_add_release_channel_to_rooms.sql
@@ -0,0 +1 @@
+ALTER TABLE rooms ADD COLUMN enviroment TEXT;
--- a/crates/collab/migrations/20231010114600_add_unique_index_on_rooms_channel_id.sql
+++ b/crates/collab/migrations/20231010114600_add_unique_index_on_rooms_channel_id.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX "index_rooms_on_channel_id" ON "rooms" ("channel_id");
--- a/crates/collab/migrations/20231011214412_add_guest_role.sql
+++ b/crates/collab/migrations/20231011214412_add_guest_role.sql
@@ -0,0 +1,4 @@
+ALTER TABLE channel_members ADD COLUMN role TEXT;
+UPDATE channel_members SET role = CASE WHEN admin THEN 'admin' ELSE 'member' END;
+
+ALTER TABLE channels ADD COLUMN visibility TEXT NOT NULL DEFAULT 'members';
--- a/crates/collab/migrations/20231017185833_projects_room_id_fkey_on_delete_cascade.sql
+++ b/crates/collab/migrations/20231017185833_projects_room_id_fkey_on_delete_cascade.sql
@@ -0,0 +1,8 @@
+-- Add migration script here
+
+ALTER TABLE projects
+  DROP CONSTRAINT projects_room_id_fkey,
+  ADD CONSTRAINT  projects_room_id_fkey
+    FOREIGN KEY (room_id)
+    REFERENCES rooms (id)
+    ON DELETE CASCADE;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Richard Feldman	cc5f5e35e4	Clean up some comments	2025-12-05 13:00:19 -05:00
Richard Feldman	7183b8a1cd	Fix API key bug	2025-12-05 12:59:19 -05:00
Richard Feldman	b1934fb712	Remove builtin Anthropic provider	2025-12-05 12:11:51 -05:00
Richard Feldman	a198b6c0d1	Use icon in more places	2025-12-05 11:48:11 -05:00
Richard Feldman	8b5b2712c8	Update Cargo.lock	2025-12-05 11:32:58 -05:00
Richard Feldman	4464392e8e	Use kebab-case for open-router extension too.	2025-12-05 11:19:10 -05:00
Richard Feldman	a0d3bc31e9	Rename copilot_chat to copilot-chat	2025-12-05 11:15:43 -05:00
Richard Feldman	ccd6672d1a	Revert "Remove builtin extensions for now" This reverts commit `5559726fd7`.	2025-12-05 11:13:29 -05:00
Richard Feldman	21de6d35dd	Revert "Revert auto-install extensions for now" This reverts commit `2031ca17e5`.	2025-12-05 11:13:22 -05:00
Richard Feldman	2031ca17e5	Revert auto-install extensions for now	2025-12-05 11:06:12 -05:00
Richard Feldman	8b1ce75a57	Move wit extensions into their own module	2025-12-05 10:30:02 -05:00
Richard Feldman	5559726fd7	Remove builtin extensions for now	2025-12-04 17:20:47 -05:00
Richard Feldman	e1a9269921	Delete example provider extension	2025-12-04 17:20:47 -05:00
Richard Feldman	3b6b3ff504	Specify env vars for the builtin extensions	2025-12-04 17:19:35 -05:00
Richard Feldman	aabed94970	Add OAuth via web authentication to llm extensions, migrate copilot	2025-12-04 17:12:55 -05:00
Richard Feldman	2d3a3521ba	Add OAuth Web Flow auth option for llm provider extensions	2025-12-04 17:12:55 -05:00
Richard Feldman	a48bd10da0	Add llm extensions to auto_install_extensions	2025-12-04 17:12:55 -05:00
Richard Feldman	fec9525be4	Add env var checkbox	2025-12-04 17:12:23 -05:00
Richard Feldman	bf2b8e999e	use fill=black over fill=currentColor	2025-12-04 16:51:47 -05:00
Richard Feldman	63c35d2b00	Use local icons in llm extensions	2025-12-04 16:48:25 -05:00
Richard Feldman	1396c68010	Add svg icons to llm provider extensions	2025-12-04 16:43:49 -05:00
Richard Feldman	fcb3d3dec6	Update a comment	2025-12-04 16:28:29 -05:00
Richard Feldman	f54e7f8c9d	Add trailing newlines	2025-12-04 16:18:43 -05:00
Richard Feldman	2a89529d7f	Use named fields	2025-12-04 16:17:50 -05:00
Richard Feldman	58207325e2	restore impl Drop for WasmExtension	2025-12-04 16:12:21 -05:00
Richard Feldman	e08ab99e8d	Add extensions for LLM providers	2025-12-04 16:03:51 -05:00
Richard Feldman	a95f3f33a4	Clean up debug logging	2025-12-04 12:38:06 -05:00
Richard Feldman	b0767c1b1f	Merge remote-tracking branch 'origin/main' into provider-extensions	2025-12-04 12:27:15 -05:00
Richard Feldman	b200e10bc4	Clean up debug statements	2025-12-04 11:30:44 -05:00
Richard Feldman	948905d916	Revise provider extensions for Gemini API	2025-12-03 20:22:10 -05:00
Richard Feldman	04de456373	Use extension-llm- prefix for credential keys	2025-12-03 15:55:10 -05:00
Richard Feldman	e5ce32e936	Add provider extension API key in settings	2025-12-03 14:41:39 -05:00
Richard Feldman	d7caae30de	Fix auth and subscriptions for provider extensions	2025-12-03 13:00:53 -05:00
Richard Feldman	c7e77674a1	Initial Claude Opus 4.5 implementation of Provider Extensions	2025-12-02 13:50:00 -05:00
				`@@ -0,0 +1 @@`
				`CREATE INDEX "index_room_participants_on_room_id" ON "room_participants" ("room_id");`
				`@@ -0,0 +1 @@`
				`ALTER TABLE room_participants ADD COLUMN participant_index INTEGER;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE rooms ADD COLUMN enviroment TEXT;`
				`@@ -0,0 +1 @@`
				`CREATE UNIQUE INDEX "index_rooms_on_channel_id" ON "rooms" ("channel_id");`