add component to split off audio to llm

.cargo/config.toml

@@ -4,8 +4,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
 
 [alias]
 xtask = "run --package xtask --"
-perf-test = ["test", "--profile", "release-fast", "--lib", "--bins", "--tests", "--config", "target.'cfg(true)'.runner='cargo run -p perf --release'", "--config", "target.'cfg(true)'.rustflags=[\"--cfg\", \"perf_enabled\"]"]
-perf-compare = ["run", "--release", "-p", "perf", "--", "compare"]
 
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"

.github/ISSUE_TEMPLATE/07_bug_windows_alpha.yml

@@ -1,8 +1,8 @@
-name: Bug Report (Windows Beta)
-description: Zed Windows Beta Related Bugs
+name: Bug Report (Windows Alpha)
+description: Zed Windows Alpha Related Bugs
 type: "Bug"
 labels: ["windows"]
-title: "Windows Beta: <a short description of the Windows bug>"
+title: "Windows Alpha: <a short description of the Windows bug>"
 body:
   - type: textarea
     attributes:

.github/workflows/community_release_actions.yml

@@ -1,6 +1,3 @@
-# IF YOU UPDATE THE NAME OF ANY GITHUB SECRET, YOU MUST CHERRY PICK THE COMMIT
-# TO BOTH STABLE AND PREVIEW CHANNELS
-
 name: Release Actions
 
 on:
@@ -16,9 +13,9 @@ jobs:
         id: get-release-url
         run: |
           if [ "${{ github.event.release.prerelease }}" == "true" ]; then
-              URL="https://zed.dev/releases/preview"
+              URL="https://zed.dev/releases/preview/latest"
           else
-              URL="https://zed.dev/releases/stable"
+              URL="https://zed.dev/releases/stable/latest"
           fi
 
           echo "URL=$URL" >> "$GITHUB_OUTPUT"

.gitignore

@@ -20,7 +20,6 @@
 .venv
 .vscode
 .wrangler
-.perf-runs
 /assets/*licenses.*
 /crates/collab/seed.json
 /crates/theme/schemas/theme.json

Cargo.toml

@@ -35,7 +35,6 @@ members = [
     "crates/cloud_api_client",
     "crates/cloud_api_types",
     "crates/cloud_llm_client",
-    "crates/cloud_zeta2_prompt",
     "crates/collab",
     "crates/collab_ui",
     "crates/collections",
@@ -59,7 +58,6 @@ members = [
     "crates/edit_prediction",
     "crates/edit_prediction_button",
     "crates/edit_prediction_context",
-    "crates/zeta2_tools",
     "crates/editor",
     "crates/eval",
     "crates/explorer_command_injector",
@@ -151,8 +149,9 @@ members = [
     "crates/semantic_version",
     "crates/session",
     "crates/settings",
-    "crates/settings_macros",
     "crates/settings_profile_selector",
+    "crates/settings_ui",
+    "crates/settings_ui_macros",
     "crates/snippet",
     "crates/snippet_provider",
     "crates/snippets_ui",
@@ -200,7 +199,6 @@ members = [
     "crates/zed_actions",
     "crates/zed_env_vars",
     "crates/zeta",
-    "crates/zeta2",
     "crates/zeta_cli",
     "crates/zlog",
     "crates/zlog_settings",
@@ -221,7 +219,6 @@ members = [
     # Tooling
     #
 
-    "tooling/perf",
     "tooling/workspace-hack",
     "tooling/xtask",
 ]
@@ -272,7 +269,6 @@ clock = { path = "crates/clock" }
 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" }
@@ -319,7 +315,6 @@ image_viewer = { path = "crates/image_viewer" }
 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" }
 jj = { path = "crates/jj" }
@@ -359,7 +354,6 @@ outline = { path = "crates/outline" }
 outline_panel = { path = "crates/outline_panel" }
 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" }
@@ -388,6 +382,7 @@ semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
 settings_ui = { path = "crates/settings_ui" }
+settings_ui_macros = { path = "crates/settings_ui_macros" }
 snippet = { path = "crates/snippet" }
 snippet_provider = { path = "crates/snippet_provider" }
 snippets_ui = { path = "crates/snippets_ui" }
@@ -435,7 +430,6 @@ zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
 zed_env_vars = { path = "crates/zed_env_vars" }
 zeta = { path = "crates/zeta" }
-zeta2 = { path = "crates/zeta2" }
 zlog = { path = "crates/zlog" }
 zlog_settings = { path = "crates/zlog_settings" }
 
@@ -443,9 +437,9 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agent-client-protocol = { version = "0.4.3", features = ["unstable"] }
+agent-client-protocol = { version = "0.2.1", features = ["unstable"] }
 aho-corasick = "1.1"
-alacritty_terminal = "0.25.1-rc1"
+alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -636,7 +630,6 @@ serde_json_lenient = { version = "0.2", features = [
 serde_path_to_error = "0.1.17"
 serde_repr = "0.1"
 serde_urlencoded = "0.7"
-serde_with = "3.4.0"
 sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
@@ -717,7 +710,6 @@ windows-core = "0.61"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
 yawc = "0.2.5"
-zeroize = "1.8"
 zstd = "0.11"
 
 [workspace.dependencies.windows]
@@ -744,7 +736,6 @@ features = [
     "Win32_Networking_WinSock",
     "Win32_Security",
     "Win32_Security_Credentials",
-    "Win32_Security_Cryptography",
     "Win32_Storage_FileSystem",
     "Win32_System_Com",
     "Win32_System_Com_StructuredStorage",

Dockerfile-collab

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2
 
-FROM rust:1.90-bookworm as builder
+FROM rust:1.89-bookworm as builder
 WORKDIR app
 COPY . .
 

assets/icons/linux.svg

@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3010_383)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71141 7.06133C3.76141 6.47267 3.78341 5.88133 3.81608 5.29133C4.10416 0.190201 11.896 0.190202 12.1841 5.29133C12.2174 5.898 12.2441 6.50333 12.3067 7.10733C12.6951 7.94202 14.3637 11.6214 13.4134 12.006C13.1894 12.096 12.8041 11.7227 12.3694 11.052C12.207 11.9614 11.7273 12.8132 11.0587 13.4467C11.7441 13.68 12.3334 13.998 12.3334 14.3333C12.3334 14.9176 3.66675 14.9257 3.66675 14.3333C3.66675 13.998 4.25608 13.68 4.94141 13.4467C4.26191 12.803 3.82279 11.9657 3.62408 11.056C3.19075 11.724 2.80608 12.096 2.58341 12.006C1.626 11.6185 3.31478 7.90684 3.71141 7.06133Z" stroke="#7B7B7B" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.11822 6.6L7.68822 7.89C7.85822 8.03 8.12822 8.03 8.29822 7.89L9.86822 6.6C10.1382 6.38 9.94822 6 9.56822 6H6.42822C6.04822 6 5.85822 6.38 6.12822 6.6H6.11822Z" fill="#7B7B7B"/>
-</g>
-<defs>
-<clipPath id="clip0_3010_383">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>

assets/keymaps/default-linux.json

@@ -1140,13 +1140,6 @@
       "ctrl-enter": "menu::Confirm"
     }
   },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
   {
     "context": "OnboardingAiConfigurationModal",
     "use_key_equivalents": true,

assets/keymaps/default-macos.json

@@ -550,8 +550,6 @@
       "cmd-ctrl-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
       "cmd-ctrl-right": "editor::SelectLargerSyntaxNode", // Expand selection
       "cmd-ctrl-up": "editor::SelectPreviousSyntaxNode", // Move selection up
-      "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand selection (VSCode version)
-      "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink selection (VSCode version)
       "cmd-ctrl-down": "editor::SelectNextSyntaxNode", // Move selection down
       "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand
       "cmd-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
@@ -1246,13 +1244,6 @@
       "cmd-enter": "menu::Confirm"
     }
   },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
   {
     "context": "OnboardingAiConfigurationModal",
     "use_key_equivalents": true,

assets/keymaps/default-windows.json

@@ -17,6 +17,7 @@
       "up": "menu::SelectPrevious",
       "enter": "menu::Confirm",
       "ctrl-enter": "menu::SecondaryConfirm",
+      "ctrl-escape": "menu::Cancel",
       "ctrl-c": "menu::Cancel",
       "escape": "menu::Cancel",
       "shift-alt-enter": "menu::Restart",
@@ -464,8 +465,8 @@
       "ctrl-k ctrl-w": "workspace::CloseAllItemsAndPanes",
       "back": "pane::GoBack",
       "alt--": "pane::GoBack",
-      "forward": "pane::GoForward",
       "alt-=": "pane::GoForward",
+      "forward": "pane::GoForward",
       "f3": "search::SelectNextMatch",
       "shift-f3": "search::SelectPreviousMatch",
       "ctrl-shift-f": "project_search::ToggleFocus",
@@ -496,6 +497,8 @@
       "shift-alt-down": "editor::DuplicateLineDown",
       "shift-alt-right": "editor::SelectLargerSyntaxNode", // Expand selection
       "shift-alt-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
+      "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand selection (VSCode version)
+      "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink selection (VSCode version)
       "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
       "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
       "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
@@ -1157,13 +1160,6 @@
       "ctrl-enter": "menu::Confirm"
     }
   },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
   {
     "context": "OnboardingAiConfigurationModal",
     "use_key_equivalents": true,
@@ -1248,8 +1244,8 @@
       "ctrl-1": "onboarding::ActivateBasicsPage",
       "ctrl-2": "onboarding::ActivateEditingPage",
       "ctrl-3": "onboarding::ActivateAISetupPage",
-      "ctrl-enter": "onboarding::Finish",
-      "alt-shift-l": "onboarding::SignIn",
+      "ctrl-escape": "onboarding::Finish",
+      "alt-tab": "onboarding::SignIn",
       "shift-alt-a": "onboarding::OpenAccount"
     }
   }

assets/keymaps/vim.json

@@ -95,8 +95,8 @@
       "g g": "vim::StartOfDocument",
       "g h": "editor::Hover",
       "g B": "editor::BlameHover",
-      "g t": "vim::GoToTab",
-      "g shift-t": "vim::GoToPreviousTab",
+      "g t": "pane::ActivateNextItem",
+      "g shift-t": "pane::ActivatePreviousItem",
       "g d": "editor::GoToDefinition",
       "g shift-d": "editor::GoToDeclaration",
       "g y": "editor::GoToTypeDefinition",
@@ -433,8 +433,6 @@
       "h": "vim::WrappingLeft",
       "l": "vim::WrappingRight",
       "y": "vim::HelixYank",
-      "p": "vim::HelixPaste",
-      "shift-p": ["vim::HelixPaste", { "before": true }],
       "alt-;": "vim::OtherEnd",
       "ctrl-r": "vim::Redo",
       "f": ["vim::PushFindForward", { "before": false, "multiline": true }],
@@ -444,8 +442,9 @@
       ">": "vim::Indent",
       "<": "vim::Outdent",
       "=": "vim::AutoIndent",
-      "`": "vim::ConvertToLowerCase",
-      "alt-`": "vim::ConvertToUpperCase",
+      "g u": "vim::PushLowercase",
+      "g shift-u": "vim::PushUppercase",
+      "g ~": "vim::PushOppositeCase",
       "g q": "vim::PushRewrap",
       "g w": "vim::PushRewrap",
       "insert": "vim::InsertBefore",

assets/settings/default.json

@@ -311,7 +311,7 @@
   // bracket, brace, single or double quote characters.
   // For example, when you select text and type (, Zed will surround the text with ().
   "use_auto_surround": true,
-  // Whether indentation should be adjusted based on the context whilst typing.
+  /// Whether indentation should be adjusted based on the context whilst typing.
   "auto_indent": true,
   // Whether indentation of pasted content should be adjusted based on the context.
   "auto_indent_on_paste": true,
@@ -408,21 +408,6 @@
     // Whether to show the menus in the titlebar.
     "show_menus": false
   },
-  "audio": {
-    // Opt into the new audio system.
-    "experimental.rodio_audio": false,
-    // Requires 'rodio_audio: true'
-    //
-    // Use the new audio systems automatic gain control for your microphone.
-    // This affects how loud you sound to others.
-    "experimental.control_input_volume": false,
-    // Requires 'rodio_audio: true'
-    //
-    // Use the new audio systems automatic gain control on everyone in the
-    // call. This makes call members who are too quite louder and those who are
-    // too loud quieter. This only affects how things sound for you.
-    "experimental.control_output_volume": false
-  },
   // Scrollbar related settings
   "scrollbar": {
     // When to show the scrollbar in the editor.
@@ -603,7 +588,6 @@
     // Toggle certain types of hints on and off, all switched on by default.
     "show_type_hints": true,
     "show_parameter_hints": true,
-    "show_value_hints": true,
     // Corresponds to null/None LSP hint type value.
     "show_other_hints": true,
     // Whether to show a background for inlay hints.
@@ -812,7 +796,7 @@
   "agent": {
     // Whether the agent is enabled.
     "enabled": true,
-    // What completion mode to start new threads in, if available. Can be 'normal' or 'burn'.
+    /// What completion mode to start new threads in, if available. Can be 'normal' or 'burn'.
     "preferred_completion_mode": "normal",
     // Whether to show the agent panel button in the status bar.
     "button": true,
@@ -822,8 +806,6 @@
     "default_width": 640,
     // Default height when the agent panel is docked to the bottom.
     "default_height": 320,
-    // The view to use by default (thread, or text_thread)
-    "default_view": "thread",
     // The default model to use when creating new threads.
     "default_model": {
       // The provider to use.
@@ -925,23 +907,27 @@
 
     // Default: false
     "play_sound_when_agent_done": false,
-    // Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
-    //
-    // Default: true
+    /// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
+    ///
+    /// Default: true
     "expand_edit_card": true,
-    // Whether to have terminal cards in the agent panel expanded, showing the whole command output.
-    //
-    // Default: true
+    /// Whether to have terminal cards in the agent panel expanded, showing the whole command output.
+    ///
+    /// Default: true
     "expand_terminal_card": true,
-    // Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages in the agent panel.
-    //
-    // Default: false
-    "use_modifier_to_send": false,
     // Minimum number of lines to display in the agent message editor.
     //
     // Default: 4
     "message_editor_min_lines": 4
   },
+  // The settings for slash commands.
+  "slash_commands": {
+    // Settings for the `/project` slash command.
+    "project": {
+      // Whether `/project` is enabled.
+      "enabled": false
+    }
+  },
   // Whether the screen sharing icon is shown in the os status bar.
   "show_call_status_icon": true,
   // Whether to use language servers to provide code intelligence.
@@ -953,7 +939,6 @@
   //
   // This is typically customized on a per-language basis.
   "language_servers": ["..."],
-
   // When to automatically save edited buffers. This setting can
   // take four values.
   //
@@ -1285,13 +1270,7 @@
     // },
     // Whether edit predictions are enabled when editing text threads.
     // This setting has no effect if globally disabled.
-    "enabled_in_text_threads": true,
-
-    "copilot": {
-      "enterprise_uri": null,
-      "proxy": null,
-      "proxy_no_verify": null
-    }
+    "enabled_in_text_threads": true
   },
   // Settings specific to journaling
   "journal": {
@@ -1514,7 +1493,7 @@
   // }
   //
   "file_types": {
-    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json", "tsconfig*.json"],
+    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
     "Shell Script": [".env.*"]
   },
   // Settings for which version of Node.js and NPM to use when installing
@@ -1794,7 +1773,6 @@
     "anthropic": {
       "api_url": "https://api.anthropic.com"
     },
-    "bedrock": {},
     "google": {
       "api_url": "https://generativelanguage.googleapis.com"
     },
@@ -1816,30 +1794,14 @@
     },
     "mistral": {
       "api_url": "https://api.mistral.ai/v1"
-    },
-    "vercel": {
-      "api_url": "https://api.v0.dev/v1"
-    },
-    "x_ai": {
-      "api_url": "https://api.x.ai/v1"
-    },
-    "zed.dev": {}
-  },
-  "session": {
-    // Whether or not to restore unsaved buffers on restart.
-    //
-    // If this is true, user won't be prompted whether to save/discard
-    // dirty files when closing the application.
-    //
-    // Default: true
-    "restore_unsaved_buffers": true
+    }
   },
   // Zed's Prettier integration settings.
   // Allows to enable/disable formatting with Prettier
   // and configure default Prettier, used when no project-level Prettier installation is found.
   "prettier": {
     // // Whether to consider prettier formatter or not when attempting to format a file.
-    "allowed": false
+    // "allowed": false,
     //
     // // Use regular Prettier json configuration.
     // // If Prettier is allowed, Zed will use this for its Prettier instance for any applicable file, if
@@ -1872,10 +1834,6 @@
     //     }
     // }
   },
-  // DAP Specific settings.
-  "dap": {
-    // Specify the DAP name as a key here.
-  },
   // Common language server settings.
   "global_lsp_settings": {
     // Whether to show the LSP servers button in the status bar.
@@ -1883,8 +1841,7 @@
   },
   // Jupyter settings
   "jupyter": {
-    "enabled": true,
-    "kernel_selections": {}
+    "enabled": true
     // Specify the language name as the key and the kernel name as the value.
     // "kernel_selections": {
     //    "python": "conda-base"
@@ -2015,11 +1972,5 @@
   //     }
   //   }
   // }
-  "profiles": [],
-
-  // A map of log scopes to the desired log level.
-  // Useful for filtering out noisy logs or enabling more verbose logging.
-  //
-  // Example: {"log": {"client": "warn"}}
-  "log": {}
+  "profiles": []
 }

assets/settings/initial_tasks.json

@@ -43,11 +43,7 @@
     //           "args": ["--login"]
     //         }
     //     }
-    "shell": "system",
-    // Whether to show the task line in the output of the spawned task, defaults to `true`.
-    "show_summary": true,
-    // Whether to show the command line in the output of the spawned task, defaults to `true`.
-    "show_command": true
+    "shell": "system"
     // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
     // "tags": []
   }

compose.yml

@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: docker.io/library/postgres:15
+    image: postgres:15
     container_name: zed_postgres
     ports:
       - 5432:5432
@@ -23,7 +23,7 @@ services:
       - ./.blob_store:/data
 
   livekit_server:
-    image: docker.io/livekit/livekit-server
+    image: livekit/livekit-server
     container_name: livekit_server
     entrypoint: /livekit-server --config /livekit.yaml
     ports:
@@ -34,7 +34,7 @@ services:
       - ./livekit.yaml:/livekit.yaml
 
   postgrest_app:
-    image: docker.io/postgrest/postgrest
+    image: postgrest/postgrest
     container_name: postgrest_app
     ports:
       - 8081:8081
@@ -47,7 +47,7 @@ services:
       - postgres
 
   postgrest_llm:
-    image: docker.io/postgrest/postgrest
+    image: postgrest/postgrest
     container_name: postgrest_llm
     ports:
       - 8082:8082
@@ -60,7 +60,7 @@ services:
       - postgres
 
   stripe-mock:
-    image: docker.io/stripe/stripe-mock:v0.178.0
+    image: stripe/stripe-mock:v0.178.0
     ports:
       - 12111:12111
       - 12112:12112

crates/acp_thread/src/acp_thread.rs

@@ -1780,26 +1780,17 @@ impl AcpThread {
         limit: Option<u32>,
         reuse_shared_snapshot: bool,
         cx: &mut Context<Self>,
-    ) -> Task<Result<String, acp::Error>> {
-        // Args are 1-based, move to 0-based
-        let line = line.unwrap_or_default().saturating_sub(1);
-        let limit = limit.unwrap_or(u32::MAX);
+    ) -> Task<Result<String>> {
         let project = self.project.clone();
         let action_log = self.action_log.clone();
         cx.spawn(async move |this, cx| {
-            let load = project
-                .update(cx, |project, cx| {
-                    let path = project
-                        .project_path_for_absolute_path(&path, cx)
-                        .ok_or_else(|| {
-                            acp::Error::resource_not_found(Some(path.display().to_string()))
-                        })?;
-                    Ok(project.open_buffer(path, cx))
-                })
-                .map_err(|e| acp::Error::internal_error().with_data(e.to_string()))
-                .flatten()?;
-
-            let buffer = load.await?;
+            let load = project.update(cx, |project, cx| {
+                let path = project
+                    .project_path_for_absolute_path(&path, cx)
+                    .context("invalid path")?;
+                anyhow::Ok(project.open_buffer(path, cx))
+            });
+            let buffer = load??.await?;
 
             let snapshot = if reuse_shared_snapshot {
                 this.read_with(cx, |this, _| {
@@ -1817,39 +1808,44 @@ impl AcpThread {
                 action_log.update(cx, |action_log, cx| {
                     action_log.buffer_read(buffer.clone(), cx);
                 })?;
-
-                let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot())?;
-                this.update(cx, |this, _| {
-                    this.shared_buffers.insert(buffer.clone(), snapshot.clone());
+                project.update(cx, |project, cx| {
+                    let position = buffer
+                        .read(cx)
+                        .snapshot()
+                        .anchor_before(Point::new(line.unwrap_or_default(), 0));
+                    project.set_agent_location(
+                        Some(AgentLocation {
+                            buffer: buffer.downgrade(),
+                            position,
+                        }),
+                        cx,
+                    );
                 })?;
-                snapshot
+
+                buffer.update(cx, |buffer, _| buffer.snapshot())?
             };
 
-            let max_point = snapshot.max_point();
-            let start_position = Point::new(line, 0);
+            this.update(cx, |this, _| {
+                let text = snapshot.text();
+                this.shared_buffers.insert(buffer.clone(), snapshot);
+                if line.is_none() && limit.is_none() {
+                    return Ok(text);
+                }
+                let limit = limit.unwrap_or(u32::MAX) as usize;
+                let Some(line) = line else {
+                    return Ok(text.lines().take(limit).collect::<String>());
+                };
 
-            if start_position > max_point {
-                return Err(acp::Error::invalid_params().with_data(format!(
-                    "Attempting to read beyond the end of the file, line {}:{}",
-                    max_point.row + 1,
-                    max_point.column
-                )));
-            }
-
-            let start = snapshot.anchor_before(start_position);
-            let end = snapshot.anchor_before(Point::new(line.saturating_add(limit), 0));
-
-            project.update(cx, |project, cx| {
-                project.set_agent_location(
-                    Some(AgentLocation {
-                        buffer: buffer.downgrade(),
-                        position: start,
-                    }),
-                    cx,
-                );
-            })?;
-
-            Ok(snapshot.text_for_range(start..end).collect::<String>())
+                let count = text.lines().count();
+                if count < line as usize {
+                    anyhow::bail!("There are only {} lines", count);
+                }
+                Ok(text
+                    .lines()
+                    .skip(line as usize + 1)
+                    .take(limit)
+                    .collect::<String>())
+            })?
         })
     }
 
@@ -1985,7 +1981,7 @@ impl AcpThread {
             let terminal_id = terminal_id.clone();
             async move |_this, cx| {
                 let env = env.await;
-                let (task_command, task_args) = ShellBuilder::new(
+                let (command, args) = ShellBuilder::new(
                     project
                         .update(cx, |project, cx| {
                             project
@@ -1996,13 +1992,13 @@ impl AcpThread {
                     &Shell::Program(get_default_system_shell()),
                 )
                 .redirect_stdin_to_dev_null()
-                .build(Some(command.clone()), &args);
+                .build(Some(command), &args);
                 let terminal = project
                     .update(cx, |project, cx| {
                         project.create_terminal_task(
                             task::SpawnInTerminal {
-                                command: Some(task_command),
-                                args: task_args,
+                                command: Some(command.clone()),
+                                args: args.clone(),
                                 cwd: cwd.clone(),
                                 env,
                                 ..Default::default()
@@ -2395,188 +2391,6 @@ mod tests {
         request.await.unwrap();
     }
 
-    #[gpui::test]
-    async fn test_reading_from_line(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/tmp"), json!({"foo": "one\ntwo\nthree\nfour\n"}))
-            .await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
-            })
-            .await
-            .unwrap();
-
-        let connection = Rc::new(FakeAgentConnection::new());
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
-            .await
-            .unwrap();
-
-        // Whole file
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "one\ntwo\nthree\nfour\n");
-
-        // Only start line
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(3), None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "three\nfour\n");
-
-        // Only limit
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, Some(2), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "one\ntwo\n");
-
-        // Range
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(2), Some(2), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "two\nthree\n");
-
-        // Invalid
-        let err = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(6), Some(2), false, cx)
-            })
-            .await
-            .unwrap_err();
-
-        assert_eq!(
-            err.to_string(),
-            "Invalid params: \"Attempting to read beyond the end of the file, line 5:0\""
-        );
-    }
-
-    #[gpui::test]
-    async fn test_reading_empty_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/tmp"), json!({"foo": ""})).await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
-            })
-            .await
-            .unwrap();
-
-        let connection = Rc::new(FakeAgentConnection::new());
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
-            .await
-            .unwrap();
-
-        // Whole file
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Only start line
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(1), None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Only limit
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, Some(2), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Range
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(1), Some(1), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Invalid
-        let err = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(5), Some(2), false, cx)
-            })
-            .await
-            .unwrap_err();
-
-        assert_eq!(
-            err.to_string(),
-            "Invalid params: \"Attempting to read beyond the end of the file, line 1:0\""
-        );
-    }
-    #[gpui::test]
-    async fn test_reading_non_existing_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/tmp"), json!({})).await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path!("/tmp"), true, cx)
-            })
-            .await
-            .unwrap();
-
-        let connection = Rc::new(FakeAgentConnection::new());
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
-            .await
-            .unwrap();
-
-        // Out of project file
-        let err = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/foo").into(), None, None, false, cx)
-            })
-            .await
-            .unwrap_err();
-
-        assert_eq!(err.code, acp::ErrorCode::RESOURCE_NOT_FOUND.code);
-    }
-
     #[gpui::test]
     async fn test_succeeding_canceled_toolcall(cx: &mut TestAppContext) {
         init_test(cx);

crates/acp_thread/src/connection.rs

@@ -68,7 +68,7 @@ pub trait AgentConnection {
     ///
     /// If the agent does not support model selection, returns [None].
     /// This allows sharing the selector in UI components.
-    fn model_selector(&self, _session_id: &acp::SessionId) -> Option<Rc<dyn AgentModelSelector>> {
+    fn model_selector(&self) -> Option<Rc<dyn AgentModelSelector>> {
         None
     }
 
@@ -177,48 +177,61 @@ pub trait AgentModelSelector: 'static {
     /// If the session doesn't exist or the model is invalid, it returns an error.
     ///
     /// # Parameters
+    /// - `session_id`: The ID of the session (thread) to apply the model to.
     /// - `model`: The model to select (should be one from [list_models]).
     /// - `cx`: The GPUI app context.
     ///
     /// # Returns
     /// A task resolving to `Ok(())` on success or an error.
-    fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>>;
+    fn select_model(
+        &self,
+        session_id: acp::SessionId,
+        model_id: AgentModelId,
+        cx: &mut App,
+    ) -> Task<Result<()>>;
 
     /// Retrieves the currently selected model for a specific session (thread).
     ///
     /// # Parameters
+    /// - `session_id`: The ID of the session (thread) to query.
     /// - `cx`: The GPUI app context.
     ///
     /// # Returns
     /// A task resolving to the selected model (always set) or an error (e.g., session not found).
-    fn selected_model(&self, cx: &mut App) -> Task<Result<AgentModelInfo>>;
+    fn selected_model(
+        &self,
+        session_id: &acp::SessionId,
+        cx: &mut App,
+    ) -> Task<Result<AgentModelInfo>>;
 
     /// Whenever the model list is updated the receiver will be notified.
-    /// Optional for agents that don't update their model list.
-    fn watch(&self, _cx: &mut App) -> Option<watch::Receiver<()>> {
-        None
+    fn watch(&self, cx: &mut App) -> watch::Receiver<()>;
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct AgentModelId(pub SharedString);
+
+impl std::ops::Deref for AgentModelId {
+    type Target = SharedString;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl fmt::Display for AgentModelId {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
     }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct AgentModelInfo {
-    pub id: acp::ModelId,
+    pub id: AgentModelId,
     pub name: SharedString,
-    pub description: Option<SharedString>,
     pub icon: Option<IconName>,
 }
 
-impl From<acp::ModelInfo> for AgentModelInfo {
-    fn from(info: acp::ModelInfo) -> Self {
-        Self {
-            id: info.model_id,
-            name: info.name.into(),
-            description: info.description.map(|desc| desc.into()),
-            icon: None,
-        }
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct AgentModelGroupName(pub SharedString);
 

crates/agent/src/agent_profile.rs

@@ -49,10 +49,10 @@ impl AgentProfile {
                 .unwrap_or_default(),
         };
 
-        update_settings_file(fs, cx, {
+        update_settings_file::<AgentSettings>(fs, cx, {
             let id = id.clone();
             move |settings, _cx| {
-                profile_settings.save_to_settings(id, settings).log_err();
+                settings.create_profile(id, profile_settings).log_err();
             }
         });
 

crates/agent/src/thread.rs

@@ -3272,7 +3272,7 @@ mod tests {
 
     // Test-specific constants
     const TEST_RATE_LIMIT_RETRY_SECS: u64 = 30;
-    use agent_settings::{AgentProfileId, AgentSettings};
+    use agent_settings::{AgentProfileId, AgentSettings, LanguageModelParameters};
     use assistant_tool::ToolRegistry;
     use assistant_tools;
     use futures::StreamExt;
@@ -3289,7 +3289,7 @@ mod tests {
     use project::{FakeFs, Project};
     use prompt_store::PromptBuilder;
     use serde_json::json;
-    use settings::{LanguageModelParameters, Settings, SettingsStore};
+    use settings::{Settings, SettingsStore};
     use std::sync::Arc;
     use std::time::Duration;
     use theme::ThemeSettings;

crates/agent2/src/agent.rs

@@ -6,6 +6,7 @@ use crate::{HistoryStore, TerminalHandle, ThreadEnvironment, TitleUpdated, Token
 use acp_thread::{AcpThread, AgentModelSelector};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
+use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result, anyhow};
 use collections::{HashSet, IndexMap};
 use fs::Fs;
@@ -20,7 +21,7 @@ use project::{Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::{
     ProjectContext, PromptId, PromptStore, RulesFileContext, UserRulesContext, WorktreeContext,
 };
-use settings::{LanguageModelSelection, update_settings_file};
+use settings::update_settings_file;
 use std::any::Any;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
@@ -56,7 +57,7 @@ struct Session {
 
 pub struct LanguageModels {
     /// Access language model by ID
-    models: HashMap<acp::ModelId, Arc<dyn LanguageModel>>,
+    models: HashMap<acp_thread::AgentModelId, Arc<dyn LanguageModel>>,
     /// Cached list for returning language model information
     model_list: acp_thread::AgentModelList,
     refresh_models_rx: watch::Receiver<()>,
@@ -132,7 +133,10 @@ impl LanguageModels {
         self.refresh_models_rx.clone()
     }
 
-    pub fn model_from_id(&self, model_id: &acp::ModelId) -> Option<Arc<dyn LanguageModel>> {
+    pub fn model_from_id(
+        &self,
+        model_id: &acp_thread::AgentModelId,
+    ) -> Option<Arc<dyn LanguageModel>> {
         self.models.get(model_id).cloned()
     }
 
@@ -143,13 +147,12 @@ impl LanguageModels {
         acp_thread::AgentModelInfo {
             id: Self::model_id(model),
             name: model.name().0,
-            description: None,
             icon: Some(provider.icon()),
         }
     }
 
-    fn model_id(model: &Arc<dyn LanguageModel>) -> acp::ModelId {
-        acp::ModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
+    fn model_id(model: &Arc<dyn LanguageModel>) -> acp_thread::AgentModelId {
+        acp_thread::AgentModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
     }
 
     fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
@@ -834,15 +837,10 @@ impl NativeAgentConnection {
     }
 }
 
-struct NativeAgentModelSelector {
-    session_id: acp::SessionId,
-    connection: NativeAgentConnection,
-}
-
-impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
+impl AgentModelSelector for NativeAgentConnection {
     fn list_models(&self, cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
         log::debug!("NativeAgentConnection::list_models called");
-        let list = self.connection.0.read(cx).models.model_list.clone();
+        let list = self.0.read(cx).models.model_list.clone();
         Task::ready(if list.is_empty() {
             Err(anyhow::anyhow!("No models available"))
         } else {
@@ -850,24 +848,24 @@ impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
         })
     }
 
-    fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>> {
-        log::debug!(
-            "Setting model for session {}: {}",
-            self.session_id,
-            model_id
-        );
+    fn select_model(
+        &self,
+        session_id: acp::SessionId,
+        model_id: acp_thread::AgentModelId,
+        cx: &mut App,
+    ) -> Task<Result<()>> {
+        log::debug!("Setting model for session {}: {}", session_id, model_id);
         let Some(thread) = self
-            .connection
             .0
             .read(cx)
             .sessions
-            .get(&self.session_id)
+            .get(&session_id)
             .map(|session| session.thread.clone())
         else {
             return Task::ready(Err(anyhow!("Session not found")));
         };
 
-        let Some(model) = self.connection.0.read(cx).models.model_from_id(&model_id) else {
+        let Some(model) = self.0.read(cx).models.model_from_id(&model_id) else {
             return Task::ready(Err(anyhow!("Invalid model ID {}", model_id)));
         };
 
@@ -875,32 +873,29 @@ impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
             thread.set_model(model.clone(), cx);
         });
 
-        update_settings_file(
-            self.connection.0.read(cx).fs.clone(),
+        update_settings_file::<AgentSettings>(
+            self.0.read(cx).fs.clone(),
             cx,
             move |settings, _cx| {
-                let provider = model.provider_id().0.to_string();
-                let model = model.id().0.to_string();
-                settings
-                    .agent
-                    .get_or_insert_default()
-                    .set_model(LanguageModelSelection {
-                        provider: provider.into(),
-                        model,
-                    });
+                settings.set_model(model);
             },
         );
 
         Task::ready(Ok(()))
     }
 
-    fn selected_model(&self, cx: &mut App) -> Task<Result<acp_thread::AgentModelInfo>> {
+    fn selected_model(
+        &self,
+        session_id: &acp::SessionId,
+        cx: &mut App,
+    ) -> Task<Result<acp_thread::AgentModelInfo>> {
+        let session_id = session_id.clone();
+
         let Some(thread) = self
-            .connection
             .0
             .read(cx)
             .sessions
-            .get(&self.session_id)
+            .get(&session_id)
             .map(|session| session.thread.clone())
         else {
             return Task::ready(Err(anyhow!("Session not found")));
@@ -917,8 +912,8 @@ impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
         )))
     }
 
-    fn watch(&self, cx: &mut App) -> Option<watch::Receiver<()>> {
-        Some(self.connection.0.read(cx).models.watch())
+    fn watch(&self, cx: &mut App) -> watch::Receiver<()> {
+        self.0.read(cx).models.watch()
     }
 }
 
@@ -974,11 +969,8 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         Task::ready(Ok(()))
     }
 
-    fn model_selector(&self, session_id: &acp::SessionId) -> Option<Rc<dyn AgentModelSelector>> {
-        Some(Rc::new(NativeAgentModelSelector {
-            session_id: session_id.clone(),
-            connection: self.clone(),
-        }) as Rc<dyn AgentModelSelector>)
+    fn model_selector(&self) -> Option<Rc<dyn AgentModelSelector>> {
+        Some(Rc::new(self.clone()) as Rc<dyn AgentModelSelector>)
     }
 
     fn prompt(
@@ -1201,7 +1193,9 @@ mod tests {
     use crate::HistoryEntryId;
 
     use super::*;
-    use acp_thread::{AgentConnection, AgentModelGroupName, AgentModelInfo, MentionUri};
+    use acp_thread::{
+        AgentConnection, AgentModelGroupName, AgentModelId, AgentModelInfo, MentionUri,
+    };
     use fs::FakeFs;
     use gpui::TestAppContext;
     use indoc::indoc;
@@ -1295,25 +1289,7 @@ mod tests {
             .unwrap(),
         );
 
-        // Create a thread/session
-        let acp_thread = cx
-            .update(|cx| {
-                Rc::new(connection.clone()).new_thread(project.clone(), Path::new("/a"), cx)
-            })
-            .await
-            .unwrap();
-
-        let session_id = cx.update(|cx| acp_thread.read(cx).session_id().clone());
-
-        let models = cx
-            .update(|cx| {
-                connection
-                    .model_selector(&session_id)
-                    .unwrap()
-                    .list_models(cx)
-            })
-            .await
-            .unwrap();
+        let models = cx.update(|cx| connection.list_models(cx)).await.unwrap();
 
         let acp_thread::AgentModelList::Grouped(models) = models else {
             panic!("Unexpected model group");
@@ -1323,9 +1299,8 @@ mod tests {
             IndexMap::from_iter([(
                 AgentModelGroupName("Fake".into()),
                 vec![AgentModelInfo {
-                    id: acp::ModelId("fake/fake".into()),
+                    id: AgentModelId("fake/fake".into()),
                     name: "Fake".into(),
-                    description: None,
                     icon: Some(ui::IconName::ZedAssistant),
                 }]
             )])
@@ -1382,9 +1357,8 @@ mod tests {
         let session_id = cx.update(|cx| acp_thread.read(cx).session_id().clone());
 
         // Select a model
-        let selector = connection.model_selector(&session_id).unwrap();
-        let model_id = acp::ModelId("fake/fake".into());
-        cx.update(|cx| selector.select_model(model_id.clone(), cx))
+        let model_id = AgentModelId("fake/fake".into());
+        cx.update(|cx| connection.select_model(session_id.clone(), model_id.clone(), cx))
             .await
             .unwrap();
 

crates/agent2/src/templates/system_prompt.hbs

@@ -48,15 +48,16 @@ The one exception to this is if the user references something you don't know abo
 ## Code Block Formatting
 
 Whenever you mention a code block, you MUST use ONLY use the following format:
-
 ```path/to/Something.blah#L123-456
 (code goes here)
 ```
-
-The `#L123-456` means the line number range 123 through 456, and the path/to/Something.blah is a path in the project. (If there is no valid path in the project, then you can use /dev/null/path.extension for its path.) This is the ONLY valid way to format code blocks, because the Markdown parser does not understand the more common ```language syntax, or bare ``` blocks. It only understands this path-based syntax, and if the path is missing, then it will error and you will have to do it over again.
+The `#L123-456` means the line number range 123 through 456, and the path/to/Something.blah
+is a path in the project. (If there is no valid path in the project, then you can use
+/dev/null/path.extension for its path.) This is the ONLY valid way to format code blocks, because the Markdown parser
+does not understand the more common ```language syntax, or bare ``` blocks. It only
+understands this path-based syntax, and if the path is missing, then it will error and you will have to do it over again.
 Just to be really clear about this, if you ever find yourself writing three backticks followed by a language name, STOP!
 You have made a mistake. You can only ever put paths after triple backticks!
-
 <example>
 Based on all the information I've gathered, here's a summary of how this system works:
 1. The README file is loaded into the system.
@@ -73,7 +74,6 @@ This is the last header in the README.
 ```
 4. Finally, it passes this information on to the next process.
 </example>
-
 <example>
 In Markdown, hash marks signify headings. For example:
 ```/dev/null/example.md#L1-3
@@ -82,7 +82,6 @@ In Markdown, hash marks signify headings. For example:
 ### Level 3 heading
 ```
 </example>
-
 Here are examples of ways you must never render code blocks:
 <bad_example_do_not_do_this>
 In Markdown, hash marks signify headings. For example:
@@ -92,9 +91,7 @@ In Markdown, hash marks signify headings. For example:
 ### Level 3 heading
 ```
 </bad_example_do_not_do_this>
-
 This example is unacceptable because it does not include the path.
-
 <bad_example_do_not_do_this>
 In Markdown, hash marks signify headings. For example:
 ```markdown
@@ -104,15 +101,14 @@ In Markdown, hash marks signify headings. For example:
 ```
 </bad_example_do_not_do_this>
 This example is unacceptable because it has the language instead of the path.
-
 <bad_example_do_not_do_this>
 In Markdown, hash marks signify headings. For example:
     # Level 1 heading
     ## Level 2 heading
     ### Level 3 heading
 </bad_example_do_not_do_this>
-This example is unacceptable because it uses indentation to mark the code block instead of backticks with a path.
-
+This example is unacceptable because it uses indentation to mark the code block
+instead of backticks with a path.
 <bad_example_do_not_do_this>
 In Markdown, hash marks signify headings. For example:
 ```markdown

crates/agent2/src/tests/mod.rs

@@ -1850,18 +1850,8 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
     .unwrap();
     let connection = NativeAgentConnection(agent.clone());
 
-    // Create a thread using new_thread
-    let connection_rc = Rc::new(connection.clone());
-    let acp_thread = cx
-        .update(|cx| connection_rc.new_thread(project, cwd, cx))
-        .await
-        .expect("new_thread should succeed");
-
-    // Get the session_id from the AcpThread
-    let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
-
     // Test model_selector returns Some
-    let selector_opt = connection.model_selector(&session_id);
+    let selector_opt = connection.model_selector();
     assert!(
         selector_opt.is_some(),
         "agent2 should always support ModelSelector"
@@ -1878,16 +1868,23 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
     };
     assert!(!listed_models.is_empty(), "should have at least one model");
     assert_eq!(
-        listed_models[&AgentModelGroupName("Fake".into())][0]
-            .id
-            .0
-            .as_ref(),
+        listed_models[&AgentModelGroupName("Fake".into())][0].id.0,
         "fake/fake"
     );
 
+    // Create a thread using new_thread
+    let connection_rc = Rc::new(connection.clone());
+    let acp_thread = cx
+        .update(|cx| connection_rc.new_thread(project, cwd, cx))
+        .await
+        .expect("new_thread should succeed");
+
+    // Get the session_id from the AcpThread
+    let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
+
     // Test selected_model returns the default
     let model = cx
-        .update(|cx| selector.selected_model(cx))
+        .update(|cx| selector.selected_model(&session_id, cx))
         .await
         .expect("selected_model should succeed");
     let model = cx

crates/agent2/src/thread.rs

@@ -2477,11 +2477,8 @@ impl ToolCallEventStream {
             "always_allow" => {
                 if let Some(fs) = fs.clone() {
                     cx.update(|cx| {
-                        update_settings_file(fs, cx, |settings, _| {
-                            settings
-                                .agent
-                                .get_or_insert_default()
-                                .set_always_allow_tool_actions(true);
+                        update_settings_file::<AgentSettings>(fs, cx, |settings, _| {
+                            settings.set_always_allow_tool_actions(true);
                         });
                     })?;
                 }

crates/agent2/src/tools/copy_path_tool.rs

@@ -9,14 +9,14 @@ use std::sync::Arc;
 use util::markdown::MarkdownInlineCode;
 
 /// Copies a file or directory in the project, and returns confirmation that the copy succeeded.
-/// Directory contents will be copied recursively.
+/// Directory contents will be copied recursively (like `cp -r`).
 ///
 /// This tool should be used when it's desirable to create a copy of a file or directory without modifying the original.
 /// It's much more efficient than doing this by separately reading and then writing the file or directory's contents, so this tool should be preferred over that approach whenever copying is the goal.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CopyPathToolInput {
     /// The source path of the file or directory to copy.
-    /// If a directory is specified, its contents will be copied recursively.
+    /// If a directory is specified, its contents will be copied recursively (like `cp -r`).
     ///
     /// <example>
     /// If the project has the following files:

crates/agent2/src/tools/create_directory_tool.rs

@@ -11,7 +11,7 @@ use crate::{AgentTool, ToolCallEventStream};
 
 /// Creates a new directory at the specified path within the project. Returns confirmation that the directory was created.
 ///
-/// This tool creates a directory and all necessary parent directories. It should be used whenever you need to create new directories within the project.
+/// This tool creates a directory and all necessary parent directories (similar to `mkdir -p`). It should be used whenever you need to create new directories within the project.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CreateDirectoryToolInput {
     /// The path of the new directory.

crates/agent2/src/tools/edit_file_tool.rs

@@ -791,11 +791,14 @@ mod tests {
         // First, test with format_on_save enabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.format_on_save = Some(FormatOnSave::On);
-                    settings.project.all_languages.defaults.formatter =
-                        Some(language::language_settings::SelectedFormatter::Auto);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.format_on_save = Some(FormatOnSave::On);
+                        settings.defaults.formatter =
+                            Some(language::language_settings::SelectedFormatter::Auto);
+                    },
+                );
             });
         });
 
@@ -850,10 +853,12 @@ mod tests {
         // Next, test with format_on_save disabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.format_on_save =
-                        Some(FormatOnSave::Off);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.format_on_save = Some(FormatOnSave::Off);
+                    },
+                );
             });
         });
 
@@ -930,13 +935,12 @@ mod tests {
         // First, test with remove_trailing_whitespace_on_save enabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .remove_trailing_whitespace_on_save = Some(true);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.remove_trailing_whitespace_on_save = Some(true);
+                    },
+                );
             });
         });
 
@@ -987,13 +991,12 @@ mod tests {
         // Next, test with remove_trailing_whitespace_on_save disabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .remove_trailing_whitespace_on_save = Some(false);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.remove_trailing_whitespace_on_save = Some(false);
+                    },
+                );
             });
         });
 

crates/agent2/src/tools/grep_tool.rs

@@ -308,7 +308,7 @@ mod tests {
     use super::*;
     use gpui::{TestAppContext, UpdateGlobal};
     use language::{Language, LanguageConfig, LanguageMatcher};
-    use project::{FakeFs, Project};
+    use project::{FakeFs, Project, WorktreeSettings};
     use serde_json::json;
     use settings::SettingsStore;
     use unindent::Unindent;
@@ -827,21 +827,19 @@ mod tests {
 
         cx.update(|cx| {
             use gpui::UpdateGlobal;
+            use project::WorktreeSettings;
             use settings::SettingsStore;
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions = Some(vec![
                         "**/.secretdir".to_string(),
                         "**/.mymetadata".to_string(),
                     ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
+                    settings.private_files = Some(vec![
+                        "**/.mysecrets".to_string(),
+                        "**/*.privatekey".to_string(),
+                        "**/*.mysensitive".to_string(),
+                    ]);
                 });
             });
         });
@@ -1064,11 +1062,10 @@ mod tests {
         // Set global settings
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions =
                         Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
+                    settings.private_files = Some(vec!["**/.env".to_string()]);
                 });
             });
         });

crates/agent2/src/tools/list_directory_tool.rs

@@ -214,7 +214,7 @@ mod tests {
     use super::*;
     use gpui::{TestAppContext, UpdateGlobal};
     use indoc::indoc;
-    use project::{FakeFs, Project};
+    use project::{FakeFs, Project, WorktreeSettings};
     use serde_json::json;
     use settings::SettingsStore;
     use util::path;
@@ -421,20 +421,17 @@ mod tests {
         // Configure settings explicitly
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions = Some(vec![
                         "**/.secretdir".to_string(),
                         "**/.mymetadata".to_string(),
                         "**/.hidden_subdir".to_string(),
                     ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
+                    settings.private_files = Some(vec![
+                        "**/.mysecrets".to_string(),
+                        "**/*.privatekey".to_string(),
+                        "**/*.mysensitive".to_string(),
+                    ]);
                 });
             });
         });
@@ -568,11 +565,10 @@ mod tests {
         // Set global settings
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions =
                         Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
+                    settings.private_files = Some(vec!["**/.env".to_string()]);
                 });
             });
         });

crates/agent2/src/tools/read_file_tool.rs

@@ -201,6 +201,7 @@ impl AgentTool for ReadFileTool {
             // Check if specific line ranges are provided
             let result = if input.start_line.is_some() || input.end_line.is_some() {
                 let result = buffer.read_with(cx, |buffer, _cx| {
+                    let text = buffer.text();
                     // .max(1) because despite instructions to be 1-indexed, sometimes the model passes 0.
                     let start = input.start_line.unwrap_or(1).max(1);
                     let start_row = start - 1;
@@ -209,13 +210,13 @@ impl AgentTool for ReadFileTool {
                         anchor = Some(buffer.anchor_before(Point::new(start_row, column)));
                     }
 
-                    let mut end_row = input.end_line.unwrap_or(u32::MAX);
-                    if end_row <= start_row {
-                        end_row = start_row + 1; // read at least one lines
+                    let lines = text.split('\n').skip(start_row as usize);
+                    if let Some(end) = input.end_line {
+                        let count = end.saturating_sub(start).saturating_add(1); // Ensure at least 1 line
+                        itertools::intersperse(lines.take(count as usize), "\n").collect::<String>()
+                    } else {
+                        itertools::intersperse(lines, "\n").collect::<String>()
                     }
-                    let start = buffer.anchor_before(Point::new(start_row, 0));
-                    let end = buffer.anchor_before(Point::new(end_row, 0));
-                    buffer.text_for_range(start..end).collect::<String>()
                 })?;
 
                 action_log.update(cx, |log, cx| {
@@ -444,7 +445,7 @@ mod test {
                 tool.run(input, ToolCallEventStream::test().0, cx)
             })
             .await;
-        assert_eq!(result.unwrap(), "Line 2\nLine 3\nLine 4\n".into());
+        assert_eq!(result.unwrap(), "Line 2\nLine 3\nLine 4".into());
     }
 
     #[gpui::test]
@@ -474,7 +475,7 @@ mod test {
                 tool.clone().run(input, ToolCallEventStream::test().0, cx)
             })
             .await;
-        assert_eq!(result.unwrap(), "Line 1\nLine 2\n".into());
+        assert_eq!(result.unwrap(), "Line 1\nLine 2".into());
 
         // end_line of 0 should result in at least 1 line
         let result = cx
@@ -487,7 +488,7 @@ mod test {
                 tool.clone().run(input, ToolCallEventStream::test().0, cx)
             })
             .await;
-        assert_eq!(result.unwrap(), "Line 1\n".into());
+        assert_eq!(result.unwrap(), "Line 1".into());
 
         // when start_line > end_line, should still return at least 1 line
         let result = cx
@@ -500,7 +501,7 @@ mod test {
                 tool.clone().run(input, ToolCallEventStream::test().0, cx)
             })
             .await;
-        assert_eq!(result.unwrap(), "Line 3\n".into());
+        assert_eq!(result.unwrap(), "Line 3".into());
     }
 
     fn init_test(cx: &mut TestAppContext) {
@@ -586,21 +587,19 @@ mod test {
 
         cx.update(|cx| {
             use gpui::UpdateGlobal;
+            use project::WorktreeSettings;
             use settings::SettingsStore;
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions = Some(vec![
                         "**/.secretdir".to_string(),
                         "**/.mymetadata".to_string(),
                     ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
+                    settings.private_files = Some(vec![
+                        "**/.mysecrets".to_string(),
+                        "**/*.privatekey".to_string(),
+                        "**/*.mysensitive".to_string(),
+                    ]);
                 });
             });
         });
@@ -804,11 +803,10 @@ mod test {
         // Set global settings
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions =
                         Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
+                    settings.private_files = Some(vec!["**/.env".to_string()]);
                 });
             });
         });

crates/agent_servers/Cargo.toml

@@ -23,7 +23,6 @@ action_log.workspace = true
 agent-client-protocol.workspace = true
 agent_settings.workspace = true
 anyhow.workspace = true
-async-trait.workspace = true
 client.workspace = true
 collections.workspace = true
 env_logger = { workspace = true, optional = true }

crates/agent_servers/src/acp.rs

@@ -13,7 +13,7 @@ use util::ResultExt as _;
 
 use std::path::PathBuf;
 use std::{any::Any, cell::RefCell};
-use std::{path::Path, rc::Rc};
+use std::{path::Path, rc::Rc, sync::Arc};
 use thiserror::Error;
 
 use anyhow::{Context as _, Result};
@@ -44,7 +44,6 @@ pub struct AcpConnection {
 pub struct AcpSession {
     thread: WeakEntity<AcpThread>,
     suppress_abort_err: bool,
-    models: Option<Rc<RefCell<acp::SessionModelState>>>,
     session_modes: Option<Rc<RefCell<acp::SessionModeState>>>,
 }
 
@@ -265,7 +264,6 @@ impl AgentConnection for AcpConnection {
                 })?;
 
             let modes = response.modes.map(|modes| Rc::new(RefCell::new(modes)));
-            let models = response.models.map(|models| Rc::new(RefCell::new(models)));
 
             if let Some(default_mode) = default_mode {
                 if let Some(modes) = modes.as_ref() {
@@ -328,12 +326,10 @@ impl AgentConnection for AcpConnection {
                 )
             })?;
 
-
             let session = AcpSession {
                 thread: thread.downgrade(),
                 suppress_abort_err: false,
-                session_modes: modes,
-                models,
+                session_modes: modes
             };
             sessions.borrow_mut().insert(session_id, session);
 
@@ -454,27 +450,6 @@ impl AgentConnection for AcpConnection {
         }
     }
 
-    fn model_selector(
-        &self,
-        session_id: &acp::SessionId,
-    ) -> Option<Rc<dyn acp_thread::AgentModelSelector>> {
-        let sessions = self.sessions.clone();
-        let sessions_ref = sessions.borrow();
-        let Some(session) = sessions_ref.get(session_id) else {
-            return None;
-        };
-
-        if let Some(models) = session.models.as_ref() {
-            Some(Rc::new(AcpModelSelector::new(
-                session_id.clone(),
-                self.connection.clone(),
-                models.clone(),
-            )) as _)
-        } else {
-            None
-        }
-    }
-
     fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
         self
     }
@@ -525,88 +500,11 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
     }
 }
 
-struct AcpModelSelector {
-    session_id: acp::SessionId,
-    connection: Rc<acp::ClientSideConnection>,
-    state: Rc<RefCell<acp::SessionModelState>>,
-}
-
-impl AcpModelSelector {
-    fn new(
-        session_id: acp::SessionId,
-        connection: Rc<acp::ClientSideConnection>,
-        state: Rc<RefCell<acp::SessionModelState>>,
-    ) -> Self {
-        Self {
-            session_id,
-            connection,
-            state,
-        }
-    }
-}
-
-impl acp_thread::AgentModelSelector for AcpModelSelector {
-    fn list_models(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
-        Task::ready(Ok(acp_thread::AgentModelList::Flat(
-            self.state
-                .borrow()
-                .available_models
-                .clone()
-                .into_iter()
-                .map(acp_thread::AgentModelInfo::from)
-                .collect(),
-        )))
-    }
-
-    fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>> {
-        let connection = self.connection.clone();
-        let session_id = self.session_id.clone();
-        let old_model_id;
-        {
-            let mut state = self.state.borrow_mut();
-            old_model_id = state.current_model_id.clone();
-            state.current_model_id = model_id.clone();
-        };
-        let state = self.state.clone();
-        cx.foreground_executor().spawn(async move {
-            let result = connection
-                .set_session_model(acp::SetSessionModelRequest {
-                    session_id,
-                    model_id,
-                    meta: None,
-                })
-                .await;
-
-            if result.is_err() {
-                state.borrow_mut().current_model_id = old_model_id;
-            }
-
-            result?;
-
-            Ok(())
-        })
-    }
-
-    fn selected_model(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelInfo>> {
-        let state = self.state.borrow();
-        Task::ready(
-            state
-                .available_models
-                .iter()
-                .find(|m| m.model_id == state.current_model_id)
-                .cloned()
-                .map(acp_thread::AgentModelInfo::from)
-                .ok_or_else(|| anyhow::anyhow!("Model not found")),
-        )
-    }
-}
-
 struct ClientDelegate {
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     cx: AsyncApp,
 }
 
-#[async_trait::async_trait(?Send)]
 impl acp::Client for ClientDelegate {
     async fn request_permission(
         &self,
@@ -740,11 +638,19 @@ impl acp::Client for ClientDelegate {
         Ok(Default::default())
     }
 
-    async fn ext_method(&self, _args: acp::ExtRequest) -> Result<acp::ExtResponse, acp::Error> {
+    async fn ext_method(
+        &self,
+        _name: Arc<str>,
+        _params: Arc<serde_json::value::RawValue>,
+    ) -> Result<Arc<serde_json::value::RawValue>, acp::Error> {
         Err(acp::Error::method_not_found())
     }
 
-    async fn ext_notification(&self, _args: acp::ExtNotification) -> Result<(), acp::Error> {
+    async fn ext_notification(
+        &self,
+        _name: Arc<str>,
+        _params: Arc<serde_json::value::RawValue>,
+    ) -> Result<(), acp::Error> {
         Err(acp::Error::method_not_found())
     }
 

crates/agent_servers/src/agent_servers.rs

@@ -99,9 +99,6 @@ pub fn load_proxy_env(cx: &mut App) -> HashMap<String, String> {
 
     if let Some(no_proxy) = read_no_proxy_from_env() {
         env.insert("NO_PROXY".to_owned(), no_proxy);
-    } else if proxy_url.is_some() {
-        // We sometimes need local MCP servers that we don't want to proxy
-        env.insert("NO_PROXY".to_owned(), "localhost,127.0.0.1".to_owned());
     }
 
     env

crates/agent_servers/src/claude.rs

@@ -45,13 +45,8 @@ impl AgentServer for ClaudeCode {
     }
 
     fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        update_settings_file(fs, cx, |settings, _| {
-            settings
-                .agent_servers
-                .get_or_insert_default()
-                .claude
-                .get_or_insert_default()
-                .default_mode = mode_id.map(|m| m.to_string())
+        update_settings_file::<AllAgentServersSettings>(fs, cx, |settings, _| {
+            settings.claude.get_or_insert_default().default_mode = mode_id.map(|m| m.to_string())
         });
     }
 

crates/agent_servers/src/custom.rs

@@ -49,14 +49,8 @@ impl crate::AgentServer for CustomAgentServer {
 
     fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
         let name = self.name();
-        update_settings_file(fs, cx, move |settings, _| {
-            settings
-                .agent_servers
-                .get_or_insert_default()
-                .custom
-                .get_mut(&name)
-                .unwrap()
-                .default_mode = mode_id.map(|m| m.to_string())
+        update_settings_file::<AllAgentServersSettings>(fs, cx, move |settings, _| {
+            settings.custom.get_mut(&name).unwrap().default_mode = mode_id.map(|m| m.to_string())
         });
     }
 

crates/agent_settings/Cargo.toml

@@ -19,7 +19,6 @@ convert_case.workspace = true
 fs.workspace = true
 gpui.workspace = true
 language_model.workspace = true
-project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true

crates/agent_settings/src/agent_profile.rs

@@ -1,17 +1,15 @@
 use std::sync::Arc;
 
-use anyhow::{Result, bail};
 use collections::IndexMap;
 use convert_case::{Case, Casing as _};
 use fs::Fs;
 use gpui::{App, SharedString};
-use settings::{
-    AgentProfileContent, ContextServerPresetContent, Settings as _, SettingsContent,
-    update_settings_file,
-};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings as _, update_settings_file};
 use util::ResultExt as _;
 
-use crate::{AgentProfileId, AgentSettings};
+use crate::AgentSettings;
 
 pub mod builtin_profiles {
     use super::AgentProfileId;
@@ -25,6 +23,27 @@ pub mod builtin_profiles {
     }
 }
 
+#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize, JsonSchema)]
+pub struct AgentProfileId(pub Arc<str>);
+
+impl AgentProfileId {
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+}
+
+impl std::fmt::Display for AgentProfileId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl Default for AgentProfileId {
+    fn default() -> Self {
+        Self("write".into())
+    }
+}
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct AgentProfile {
     id: AgentProfileId,
@@ -68,10 +87,10 @@ impl AgentProfile {
                 .unwrap_or_default(),
         };
 
-        update_settings_file(fs, cx, {
+        update_settings_file::<AgentSettings>(fs, cx, {
             let id = id.clone();
             move |settings, _cx| {
-                profile_settings.save_to_settings(id, settings).log_err();
+                settings.create_profile(id, profile_settings).log_err();
             }
         });
 
@@ -110,71 +129,9 @@ impl AgentProfileSettings {
                 .get(server_id)
                 .is_some_and(|preset| preset.tools.get(tool_name) == Some(&true))
     }
-
-    pub fn save_to_settings(
-        &self,
-        profile_id: AgentProfileId,
-        content: &mut SettingsContent,
-    ) -> Result<()> {
-        let profiles = content
-            .agent
-            .get_or_insert_default()
-            .profiles
-            .get_or_insert_default();
-        if profiles.contains_key(&profile_id.0) {
-            bail!("profile with ID '{profile_id}' already exists");
-        }
-
-        profiles.insert(
-            profile_id.0,
-            AgentProfileContent {
-                name: self.name.clone().into(),
-                tools: self.tools.clone(),
-                enable_all_context_servers: Some(self.enable_all_context_servers),
-                context_servers: self
-                    .context_servers
-                    .clone()
-                    .into_iter()
-                    .map(|(server_id, preset)| {
-                        (
-                            server_id,
-                            ContextServerPresetContent {
-                                tools: preset.tools,
-                            },
-                        )
-                    })
-                    .collect(),
-            },
-        );
-
-        Ok(())
-    }
-}
-
-impl From<AgentProfileContent> for AgentProfileSettings {
-    fn from(content: AgentProfileContent) -> Self {
-        Self {
-            name: content.name.into(),
-            tools: content.tools,
-            enable_all_context_servers: content.enable_all_context_servers.unwrap_or_default(),
-            context_servers: content
-                .context_servers
-                .into_iter()
-                .map(|(server_id, preset)| (server_id, preset.into()))
-                .collect(),
-        }
-    }
 }
 
 #[derive(Debug, Clone, Default)]
 pub struct ContextServerPreset {
     pub tools: IndexMap<Arc<str>, bool>,
 }
-
-impl From<settings::ContextServerPresetContent> for ContextServerPreset {
-    fn from(content: settings::ContextServerPresetContent) -> Self {
-        Self {
-            tools: content.tools,
-        }
-    }
-}

crates/agent_settings/src/agent_settings.rs

@@ -2,16 +2,14 @@ mod agent_profile;
 
 use std::sync::Arc;
 
+use anyhow::{Result, bail};
 use collections::IndexMap;
-use gpui::{App, Pixels, px};
+use gpui::{App, Pixels, SharedString};
 use language_model::LanguageModel;
-use project::DisableAiSettings;
-use schemars::JsonSchema;
+use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};
-use settings::{
-    DefaultAgentView, DockPosition, LanguageModelParameters, LanguageModelSelection,
-    NotifyWhenAgentWaiting, Settings, SettingsContent,
-};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use std::borrow::Cow;
 
 pub use crate::agent_profile::*;
 
@@ -24,11 +22,37 @@ pub fn init(cx: &mut App) {
     AgentSettings::register(cx);
 }
 
-#[derive(Clone, Debug)]
+#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum AgentDockPosition {
+    Left,
+    #[default]
+    Right,
+    Bottom,
+}
+
+#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum DefaultView {
+    #[default]
+    Thread,
+    TextThread,
+}
+
+#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum NotifyWhenAgentWaiting {
+    #[default]
+    PrimaryScreen,
+    AllScreens,
+    Never,
+}
+
+#[derive(Default, Clone, Debug)]
 pub struct AgentSettings {
     pub enabled: bool,
     pub button: bool,
-    pub dock: DockPosition,
+    pub dock: AgentDockPosition,
     pub default_width: Pixels,
     pub default_height: Pixels,
     pub default_model: Option<LanguageModelSelection>,
@@ -36,8 +60,9 @@ pub struct AgentSettings {
     pub commit_message_model: Option<LanguageModelSelection>,
     pub thread_summary_model: Option<LanguageModelSelection>,
     pub inline_alternatives: Vec<LanguageModelSelection>,
+    pub using_outdated_settings_version: bool,
     pub default_profile: AgentProfileId,
-    pub default_view: DefaultAgentView,
+    pub default_view: DefaultView,
     pub profiles: IndexMap<AgentProfileId, AgentProfileSettings>,
     pub always_allow_tool_actions: bool,
     pub notify_when_agent_waiting: NotifyWhenAgentWaiting,
@@ -54,26 +79,13 @@ pub struct AgentSettings {
 }
 
 impl AgentSettings {
-    pub fn enabled(&self, cx: &App) -> bool {
-        self.enabled && !DisableAiSettings::get_global(cx).disable_ai
-    }
-
     pub fn temperature_for_model(model: &Arc<dyn LanguageModel>, cx: &App) -> Option<f32> {
         let settings = Self::get_global(cx);
-        for setting in settings.model_parameters.iter().rev() {
-            if let Some(provider) = &setting.provider
-                && provider.0 != model.provider_id().0
-            {
-                continue;
-            }
-            if let Some(setting_model) = &setting.model
-                && *setting_model != model.id().0
-            {
-                continue;
-            }
-            return setting.temperature;
-        }
-        return None;
+        settings
+            .model_parameters
+            .iter()
+            .rfind(|setting| setting.matches(model))
+            .and_then(|m| m.temperature)
     }
 
     pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
@@ -102,6 +114,223 @@ impl AgentSettings {
     }
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+pub struct LanguageModelParameters {
+    pub provider: Option<LanguageModelProviderSetting>,
+    pub model: Option<SharedString>,
+    pub temperature: Option<f32>,
+}
+
+impl LanguageModelParameters {
+    pub fn matches(&self, model: &Arc<dyn LanguageModel>) -> bool {
+        if let Some(provider) = &self.provider
+            && provider.0 != model.provider_id().0
+        {
+            return false;
+        }
+        if let Some(setting_model) = &self.model
+            && *setting_model != model.id().0
+        {
+            return false;
+        }
+        true
+    }
+}
+
+impl AgentSettingsContent {
+    pub fn set_dock(&mut self, dock: AgentDockPosition) {
+        self.dock = Some(dock);
+    }
+
+    pub fn set_model(&mut self, language_model: Arc<dyn LanguageModel>) {
+        let model = language_model.id().0.to_string();
+        let provider = language_model.provider_id().0.to_string();
+
+        self.default_model = Some(LanguageModelSelection {
+            provider: provider.into(),
+            model,
+        });
+    }
+
+    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
+        self.inline_assistant_model = Some(LanguageModelSelection {
+            provider: provider.into(),
+            model,
+        });
+    }
+
+    pub fn set_commit_message_model(&mut self, provider: String, model: String) {
+        self.commit_message_model = Some(LanguageModelSelection {
+            provider: provider.into(),
+            model,
+        });
+    }
+
+    pub fn set_thread_summary_model(&mut self, provider: String, model: String) {
+        self.thread_summary_model = Some(LanguageModelSelection {
+            provider: provider.into(),
+            model,
+        });
+    }
+
+    pub fn set_always_allow_tool_actions(&mut self, allow: bool) {
+        self.always_allow_tool_actions = Some(allow);
+    }
+
+    pub fn set_play_sound_when_agent_done(&mut self, allow: bool) {
+        self.play_sound_when_agent_done = Some(allow);
+    }
+
+    pub fn set_single_file_review(&mut self, allow: bool) {
+        self.single_file_review = Some(allow);
+    }
+
+    pub fn set_use_modifier_to_send(&mut self, always_use: bool) {
+        self.use_modifier_to_send = Some(always_use);
+    }
+
+    pub fn set_profile(&mut self, profile_id: AgentProfileId) {
+        self.default_profile = Some(profile_id);
+    }
+
+    pub fn create_profile(
+        &mut self,
+        profile_id: AgentProfileId,
+        profile_settings: AgentProfileSettings,
+    ) -> Result<()> {
+        let profiles = self.profiles.get_or_insert_default();
+        if profiles.contains_key(&profile_id) {
+            bail!("profile with ID '{profile_id}' already exists");
+        }
+
+        profiles.insert(
+            profile_id,
+            AgentProfileContent {
+                name: profile_settings.name.into(),
+                tools: profile_settings.tools,
+                enable_all_context_servers: Some(profile_settings.enable_all_context_servers),
+                context_servers: profile_settings
+                    .context_servers
+                    .into_iter()
+                    .map(|(server_id, preset)| {
+                        (
+                            server_id,
+                            ContextServerPresetContent {
+                                tools: preset.tools,
+                            },
+                        )
+                    })
+                    .collect(),
+            },
+        );
+
+        Ok(())
+    }
+}
+
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default, SettingsUi, SettingsKey)]
+#[settings_key(key = "agent", fallback_key = "assistant")]
+pub struct AgentSettingsContent {
+    /// Whether the Agent is enabled.
+    ///
+    /// Default: true
+    enabled: Option<bool>,
+    /// Whether to show the agent panel button in the status bar.
+    ///
+    /// Default: true
+    button: Option<bool>,
+    /// Where to dock the agent panel.
+    ///
+    /// Default: right
+    dock: Option<AgentDockPosition>,
+    /// Default width in pixels when the agent panel is docked to the left or right.
+    ///
+    /// Default: 640
+    default_width: Option<f32>,
+    /// Default height in pixels when the agent panel is docked to the bottom.
+    ///
+    /// Default: 320
+    default_height: Option<f32>,
+    /// The default model to use when creating new chats and for other features when a specific model is not specified.
+    default_model: Option<LanguageModelSelection>,
+    /// Model to use for the inline assistant. Defaults to default_model when not specified.
+    inline_assistant_model: Option<LanguageModelSelection>,
+    /// Model to use for generating git commit messages. Defaults to default_model when not specified.
+    commit_message_model: Option<LanguageModelSelection>,
+    /// Model to use for generating thread summaries. Defaults to default_model when not specified.
+    thread_summary_model: Option<LanguageModelSelection>,
+    /// Additional models with which to generate alternatives when performing inline assists.
+    inline_alternatives: Option<Vec<LanguageModelSelection>>,
+    /// The default profile to use in the Agent.
+    ///
+    /// Default: write
+    default_profile: Option<AgentProfileId>,
+    /// Which view type to show by default in the agent panel.
+    ///
+    /// Default: "thread"
+    default_view: Option<DefaultView>,
+    /// The available agent profiles.
+    pub profiles: Option<IndexMap<AgentProfileId, AgentProfileContent>>,
+    /// Whenever a tool action would normally wait for your confirmation
+    /// that you allow it, always choose to allow it.
+    ///
+    /// This setting has no effect on external agents that support permission modes, such as Claude Code.
+    ///
+    /// Set `agent_servers.claude.default_mode` to `bypassPermissions`, to disable all permission requests when using Claude Code.
+    ///
+    /// Default: false
+    always_allow_tool_actions: Option<bool>,
+    /// Where to show a popup notification when the agent is waiting for user input.
+    ///
+    /// Default: "primary_screen"
+    notify_when_agent_waiting: Option<NotifyWhenAgentWaiting>,
+    /// Whether to play a sound when the agent has either completed its response, or needs user input.
+    ///
+    /// Default: false
+    play_sound_when_agent_done: Option<bool>,
+    /// Whether to stream edits from the agent as they are received.
+    ///
+    /// Default: false
+    stream_edits: Option<bool>,
+    /// Whether to display agent edits in single-file editors in addition to the review multibuffer pane.
+    ///
+    /// Default: true
+    single_file_review: Option<bool>,
+    /// 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
+    /// and model are optional, so that you can specify parameters for either
+    /// one.
+    ///
+    /// Default: []
+    #[serde(default)]
+    model_parameters: Vec<LanguageModelParameters>,
+    /// What completion mode to enable for new threads
+    ///
+    /// Default: normal
+    preferred_completion_mode: Option<CompletionMode>,
+    /// Whether to show thumb buttons for feedback in the agent panel.
+    ///
+    /// Default: true
+    enable_feedback: Option<bool>,
+    /// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
+    ///
+    /// Default: true
+    expand_edit_card: Option<bool>,
+    /// Whether to have terminal cards in the agent panel expanded, showing the whole command output.
+    ///
+    /// Default: true
+    expand_terminal_card: Option<bool>,
+    /// Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages in the agent panel.
+    ///
+    /// Default: false
+    use_modifier_to_send: Option<bool>,
+    /// Minimum number of lines of height the agent message editor should have.
+    ///
+    /// Default: 4
+    message_editor_min_lines: Option<usize>,
+}
+
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
 #[serde(rename_all = "snake_case")]
 pub enum CompletionMode {
@@ -120,80 +349,215 @@ impl From<CompletionMode> for cloud_llm_client::CompletionMode {
     }
 }
 
-impl From<settings::CompletionMode> for CompletionMode {
-    fn from(value: settings::CompletionMode) -> Self {
-        match value {
-            settings::CompletionMode::Normal => CompletionMode::Normal,
-            settings::CompletionMode::Burn => CompletionMode::Burn,
-        }
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+pub struct LanguageModelSelection {
+    pub provider: LanguageModelProviderSetting,
+    pub model: String,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct LanguageModelProviderSetting(pub String);
+
+impl JsonSchema for LanguageModelProviderSetting {
+    fn schema_name() -> Cow<'static, str> {
+        "LanguageModelProviderSetting".into()
+    }
+
+    fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
+        // list the builtin providers as a subset so that we still auto complete them in the settings
+        json_schema!({
+            "anyOf": [
+                {
+                    "type": "string",
+                    "enum": [
+                        "amazon-bedrock",
+                        "anthropic",
+                        "copilot_chat",
+                        "deepseek",
+                        "google",
+                        "lmstudio",
+                        "mistral",
+                        "ollama",
+                        "openai",
+                        "openrouter",
+                        "vercel",
+                        "x_ai",
+                        "zed.dev"
+                    ]
+                },
+                {
+                    "type": "string",
+                }
+            ]
+        })
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct AgentProfileId(pub Arc<str>);
-
-impl AgentProfileId {
-    pub fn as_str(&self) -> &str {
-        &self.0
+impl From<String> for LanguageModelProviderSetting {
+    fn from(provider: String) -> Self {
+        Self(provider)
     }
 }
 
-impl std::fmt::Display for AgentProfileId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
+impl From<&str> for LanguageModelProviderSetting {
+    fn from(provider: &str) -> Self {
+        Self(provider.to_string())
     }
 }
 
-impl Default for AgentProfileId {
-    fn default() -> Self {
-        Self("write".into())
-    }
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
+pub struct AgentProfileContent {
+    pub name: Arc<str>,
+    #[serde(default)]
+    pub tools: IndexMap<Arc<str>, bool>,
+    /// Whether all context servers are enabled by default.
+    pub enable_all_context_servers: Option<bool>,
+    #[serde(default)]
+    pub context_servers: IndexMap<Arc<str>, ContextServerPresetContent>,
+}
+
+#[derive(Debug, PartialEq, Clone, Default, Serialize, Deserialize, JsonSchema)]
+pub struct ContextServerPresetContent {
+    pub tools: IndexMap<Arc<str>, bool>,
 }
 
 impl Settings for AgentSettings {
-    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
-        let agent = content.agent.clone().unwrap();
-        Self {
-            enabled: agent.enabled.unwrap(),
-            button: agent.button.unwrap(),
-            dock: agent.dock.unwrap(),
-            default_width: px(agent.default_width.unwrap()),
-            default_height: px(agent.default_height.unwrap()),
-            default_model: Some(agent.default_model.unwrap()),
-            inline_assistant_model: agent.inline_assistant_model,
-            commit_message_model: agent.commit_message_model,
-            thread_summary_model: agent.thread_summary_model,
-            inline_alternatives: agent.inline_alternatives.unwrap_or_default(),
-            default_profile: AgentProfileId(agent.default_profile.unwrap()),
-            default_view: agent.default_view.unwrap(),
-            profiles: agent
-                .profiles
-                .unwrap()
-                .into_iter()
-                .map(|(key, val)| (AgentProfileId(key), val.into()))
-                .collect(),
-            always_allow_tool_actions: agent.always_allow_tool_actions.unwrap(),
-            notify_when_agent_waiting: agent.notify_when_agent_waiting.unwrap(),
-            play_sound_when_agent_done: agent.play_sound_when_agent_done.unwrap(),
-            stream_edits: agent.stream_edits.unwrap(),
-            single_file_review: agent.single_file_review.unwrap(),
-            model_parameters: agent.model_parameters,
-            preferred_completion_mode: agent.preferred_completion_mode.unwrap().into(),
-            enable_feedback: agent.enable_feedback.unwrap(),
-            expand_edit_card: agent.expand_edit_card.unwrap(),
-            expand_terminal_card: agent.expand_terminal_card.unwrap(),
-            use_modifier_to_send: agent.use_modifier_to_send.unwrap(),
-            message_editor_min_lines: agent.message_editor_min_lines.unwrap(),
+    const PRESERVED_KEYS: Option<&'static [&'static str]> = Some(&["version"]);
+
+    type FileContent = AgentSettingsContent;
+
+    fn load(
+        sources: SettingsSources<Self::FileContent>,
+        _: &mut gpui::App,
+    ) -> anyhow::Result<Self> {
+        let mut settings = AgentSettings::default();
+
+        for value in sources.defaults_and_customizations() {
+            merge(&mut settings.enabled, value.enabled);
+            merge(&mut settings.button, value.button);
+            merge(&mut settings.dock, value.dock);
+            merge(
+                &mut settings.default_width,
+                value.default_width.map(Into::into),
+            );
+            merge(
+                &mut settings.default_height,
+                value.default_height.map(Into::into),
+            );
+            settings.default_model = value
+                .default_model
+                .clone()
+                .or(settings.default_model.take());
+            settings.inline_assistant_model = value
+                .inline_assistant_model
+                .clone()
+                .or(settings.inline_assistant_model.take());
+            settings.commit_message_model = value
+                .clone()
+                .commit_message_model
+                .or(settings.commit_message_model.take());
+            settings.thread_summary_model = value
+                .clone()
+                .thread_summary_model
+                .or(settings.thread_summary_model.take());
+            merge(
+                &mut settings.inline_alternatives,
+                value.inline_alternatives.clone(),
+            );
+            merge(
+                &mut settings.notify_when_agent_waiting,
+                value.notify_when_agent_waiting,
+            );
+            merge(
+                &mut settings.play_sound_when_agent_done,
+                value.play_sound_when_agent_done,
+            );
+            merge(&mut settings.stream_edits, value.stream_edits);
+            merge(&mut settings.single_file_review, value.single_file_review);
+            merge(&mut settings.default_profile, value.default_profile.clone());
+            merge(&mut settings.default_view, value.default_view);
+            merge(
+                &mut settings.preferred_completion_mode,
+                value.preferred_completion_mode,
+            );
+            merge(&mut settings.enable_feedback, value.enable_feedback);
+            merge(&mut settings.expand_edit_card, value.expand_edit_card);
+            merge(
+                &mut settings.expand_terminal_card,
+                value.expand_terminal_card,
+            );
+            merge(
+                &mut settings.use_modifier_to_send,
+                value.use_modifier_to_send,
+            );
+            merge(
+                &mut settings.message_editor_min_lines,
+                value.message_editor_min_lines,
+            );
+
+            settings
+                .model_parameters
+                .extend_from_slice(&value.model_parameters);
+
+            if let Some(profiles) = value.profiles.as_ref() {
+                settings
+                    .profiles
+                    .extend(profiles.into_iter().map(|(id, profile)| {
+                        (
+                            id.clone(),
+                            AgentProfileSettings {
+                                name: profile.name.clone().into(),
+                                tools: profile.tools.clone(),
+                                enable_all_context_servers: profile
+                                    .enable_all_context_servers
+                                    .unwrap_or_default(),
+                                context_servers: profile
+                                    .context_servers
+                                    .iter()
+                                    .map(|(context_server_id, preset)| {
+                                        (
+                                            context_server_id.clone(),
+                                            ContextServerPreset {
+                                                tools: preset.tools.clone(),
+                                            },
+                                        )
+                                    })
+                                    .collect(),
+                            },
+                        )
+                    }));
+            }
         }
+
+        debug_assert!(
+            !sources.default.always_allow_tool_actions.unwrap_or(false),
+            "For security, agent.always_allow_tool_actions should always be false in default.json. If it's true, that is a bug that should be fixed!"
+        );
+
+        // For security reasons, only trust the user's global settings for whether to always allow tool actions.
+        // If this could be overridden locally, an attacker could (e.g. by committing to source control and
+        // convincing you to switch branches) modify your project-local settings to disable the agent's safety checks.
+        settings.always_allow_tool_actions = sources
+            .user
+            .and_then(|setting| setting.always_allow_tool_actions)
+            .unwrap_or(false);
+
+        Ok(settings)
     }
 
-    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut SettingsContent) {
+    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
         if let Some(b) = vscode
             .read_value("chat.agent.enabled")
             .and_then(|b| b.as_bool())
         {
-            current.agent.get_or_insert_default().enabled = Some(b);
-            current.agent.get_or_insert_default().button = Some(b);
+            current.enabled = Some(b);
+            current.button = Some(b);
         }
     }
 }
+
+fn merge<T>(target: &mut T, value: Option<T>) {
+    if let Some(value) = value {
+        *target = value;
+    }
+}

crates/agent_ui/Cargo.toml

@@ -80,7 +80,6 @@ serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
 settings.workspace = true
-shlex.workspace = true
 smol.workspace = true
 streaming_diff.workspace = true
 task.workspace = true

crates/agent_ui/src/acp/message_editor.rs

@@ -47,7 +47,12 @@ use std::{
 };
 use text::OffsetRangeExt;
 use theme::ThemeSettings;
-use ui::{ButtonLike, TintColor, Toggleable, prelude::*};
+use ui::{
+    ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, ButtonStyle, Color, Element as _,
+    FluentBuilder as _, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
+    LabelCommon, LabelSize, ParentElement, Render, SelectableButton, Styled, TextSize, TintColor,
+    Toggleable, Window, div, h_flex,
+};
 use util::{ResultExt, debug_panic};
 use workspace::{Workspace, notifications::NotifyResultExt as _};
 use zed_actions::agent::Chat;
@@ -359,7 +364,7 @@ impl MessageEditor {
 
         let task = match mention_uri.clone() {
             MentionUri::Fetch { url } => self.confirm_mention_for_fetch(url, cx),
-            MentionUri::Directory { .. } => Task::ready(Ok(Mention::UriOnly)),
+            MentionUri::Directory { abs_path } => self.confirm_mention_for_directory(abs_path, cx),
             MentionUri::Thread { id, .. } => self.confirm_mention_for_thread(id, cx),
             MentionUri::TextThread { path, .. } => self.confirm_mention_for_text_thread(path, cx),
             MentionUri::File { abs_path } => self.confirm_mention_for_file(abs_path, cx),
@@ -463,6 +468,97 @@ impl MessageEditor {
         })
     }
 
+    fn confirm_mention_for_directory(
+        &mut self,
+        abs_path: PathBuf,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Mention>> {
+        fn collect_files_in_path(worktree: &Worktree, path: &Path) -> Vec<(Arc<Path>, PathBuf)> {
+            let mut files = Vec::new();
+
+            for entry in worktree.child_entries(path) {
+                if entry.is_dir() {
+                    files.extend(collect_files_in_path(worktree, &entry.path));
+                } else if entry.is_file() {
+                    files.push((entry.path.clone(), worktree.full_path(&entry.path)));
+                }
+            }
+
+            files
+        }
+
+        let Some(project_path) = self
+            .project
+            .read(cx)
+            .project_path_for_absolute_path(&abs_path, cx)
+        else {
+            return Task::ready(Err(anyhow!("project path not found")));
+        };
+        let Some(entry) = self.project.read(cx).entry_for_path(&project_path, cx) else {
+            return Task::ready(Err(anyhow!("project entry not found")));
+        };
+        let directory_path = entry.path.clone();
+        let worktree_id = project_path.worktree_id;
+        let Some(worktree) = self.project.read(cx).worktree_for_id(worktree_id, cx) else {
+            return Task::ready(Err(anyhow!("worktree not found")));
+        };
+        let project = self.project.clone();
+        cx.spawn(async move |_, cx| {
+            let file_paths = worktree.read_with(cx, |worktree, _cx| {
+                collect_files_in_path(worktree, &directory_path)
+            })?;
+            let descendants_future = cx.update(|cx| {
+                join_all(file_paths.into_iter().map(|(worktree_path, full_path)| {
+                    let rel_path = worktree_path
+                        .strip_prefix(&directory_path)
+                        .log_err()
+                        .map_or_else(|| worktree_path.clone(), |rel_path| rel_path.into());
+
+                    let open_task = project.update(cx, |project, cx| {
+                        project.buffer_store().update(cx, |buffer_store, cx| {
+                            let project_path = ProjectPath {
+                                worktree_id,
+                                path: worktree_path,
+                            };
+                            buffer_store.open_buffer(project_path, cx)
+                        })
+                    });
+
+                    cx.spawn(async move |cx| {
+                        let buffer = open_task.await.log_err()?;
+                        let buffer_content = outline::get_buffer_content_or_outline(
+                            buffer.clone(),
+                            Some(&full_path),
+                            &cx,
+                        )
+                        .await
+                        .ok()?;
+
+                        Some((rel_path, full_path, buffer_content.text, buffer))
+                    })
+                }))
+            })?;
+
+            let contents = cx
+                .background_spawn(async move {
+                    let (contents, tracked_buffers) = descendants_future
+                        .await
+                        .into_iter()
+                        .flatten()
+                        .map(|(rel_path, full_path, rope, buffer)| {
+                            ((rel_path, full_path, rope), buffer)
+                        })
+                        .unzip();
+                    Mention::Text {
+                        content: render_directory_contents(contents),
+                        tracked_buffers,
+                    }
+                })
+                .await;
+            anyhow::Ok(contents)
+        })
+    }
+
     fn confirm_mention_for_fetch(
         &mut self,
         url: url::Url,
@@ -680,7 +776,6 @@ impl MessageEditor {
 
     pub fn contents(
         &self,
-        full_mention_content: bool,
         cx: &mut Context<Self>,
     ) -> Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>> {
         // Check for unsupported slash commands before spawning async task
@@ -692,12 +787,9 @@ impl MessageEditor {
             return Task::ready(Err(err));
         }
 
-        let contents = self.mention_set.contents(
-            &self.prompt_capabilities.borrow(),
-            full_mention_content,
-            self.project.clone(),
-            cx,
-        );
+        let contents = self
+            .mention_set
+            .contents(&self.prompt_capabilities.borrow(), cx);
         let editor = self.editor.clone();
 
         cx.spawn(async move |_, cx| {
@@ -1171,96 +1263,6 @@ impl MessageEditor {
     }
 }
 
-fn full_mention_for_directory(
-    project: &Entity<Project>,
-    abs_path: &Path,
-    cx: &mut App,
-) -> Task<Result<Mention>> {
-    fn collect_files_in_path(worktree: &Worktree, path: &Path) -> Vec<(Arc<Path>, PathBuf)> {
-        let mut files = Vec::new();
-
-        for entry in worktree.child_entries(path) {
-            if entry.is_dir() {
-                files.extend(collect_files_in_path(worktree, &entry.path));
-            } else if entry.is_file() {
-                files.push((entry.path.clone(), worktree.full_path(&entry.path)));
-            }
-        }
-
-        files
-    }
-
-    let Some(project_path) = project
-        .read(cx)
-        .project_path_for_absolute_path(&abs_path, cx)
-    else {
-        return Task::ready(Err(anyhow!("project path not found")));
-    };
-    let Some(entry) = project.read(cx).entry_for_path(&project_path, cx) else {
-        return Task::ready(Err(anyhow!("project entry not found")));
-    };
-    let directory_path = entry.path.clone();
-    let worktree_id = project_path.worktree_id;
-    let Some(worktree) = project.read(cx).worktree_for_id(worktree_id, cx) else {
-        return Task::ready(Err(anyhow!("worktree not found")));
-    };
-    let project = project.clone();
-    cx.spawn(async move |cx| {
-        let file_paths = worktree.read_with(cx, |worktree, _cx| {
-            collect_files_in_path(worktree, &directory_path)
-        })?;
-        let descendants_future = cx.update(|cx| {
-            join_all(file_paths.into_iter().map(|(worktree_path, full_path)| {
-                let rel_path = worktree_path
-                    .strip_prefix(&directory_path)
-                    .log_err()
-                    .map_or_else(|| worktree_path.clone(), |rel_path| rel_path.into());
-
-                let open_task = project.update(cx, |project, cx| {
-                    project.buffer_store().update(cx, |buffer_store, cx| {
-                        let project_path = ProjectPath {
-                            worktree_id,
-                            path: worktree_path,
-                        };
-                        buffer_store.open_buffer(project_path, cx)
-                    })
-                });
-
-                cx.spawn(async move |cx| {
-                    let buffer = open_task.await.log_err()?;
-                    let buffer_content = outline::get_buffer_content_or_outline(
-                        buffer.clone(),
-                        Some(&full_path),
-                        &cx,
-                    )
-                    .await
-                    .ok()?;
-
-                    Some((rel_path, full_path, buffer_content.text, buffer))
-                })
-            }))
-        })?;
-
-        let contents = cx
-            .background_spawn(async move {
-                let (contents, tracked_buffers) = descendants_future
-                    .await
-                    .into_iter()
-                    .flatten()
-                    .map(|(rel_path, full_path, rope, buffer)| {
-                        ((rel_path, full_path, rope), buffer)
-                    })
-                    .unzip();
-                Mention::Text {
-                    content: render_directory_contents(contents),
-                    tracked_buffers,
-                }
-            })
-            .await;
-        anyhow::Ok(contents)
-    })
-}
-
 fn render_directory_contents(entries: Vec<(Arc<Path>, PathBuf, String)>) -> String {
     let mut output = String::new();
     for (_relative_path, full_path, content) in entries {
@@ -1286,14 +1288,18 @@ impl Render for MessageEditor {
             .flex_1()
             .child({
                 let settings = ThemeSettings::get_global(cx);
+                let font_size = TextSize::Small
+                    .rems(cx)
+                    .to_pixels(settings.agent_font_size(cx));
+                let line_height = settings.buffer_line_height.value() * font_size;
 
                 let text_style = TextStyle {
                     color: cx.theme().colors().text,
                     font_family: settings.buffer_font.family.clone(),
                     font_fallbacks: settings.buffer_font.fallbacks.clone(),
                     font_features: settings.buffer_font.features.clone(),
-                    font_size: settings.buffer_font_size(cx).into(),
-                    line_height: relative(settings.buffer_line_height.value()),
+                    font_size: font_size.into(),
+                    line_height: line_height.into(),
                     ..Default::default()
                 };
 
@@ -1508,8 +1514,6 @@ impl MentionSet {
     fn contents(
         &self,
         prompt_capabilities: &acp::PromptCapabilities,
-        full_mention_content: bool,
-        project: Entity<Project>,
         cx: &mut App,
     ) -> Task<Result<HashMap<CreaseId, (MentionUri, Mention)>>> {
         if !prompt_capabilities.embedded_context {
@@ -1523,19 +1527,13 @@ impl MentionSet {
         }
 
         let mentions = self.mentions.clone();
-        cx.spawn(async move |cx| {
+        cx.spawn(async move |_cx| {
             let mut contents = HashMap::default();
             for (crease_id, (mention_uri, task)) in mentions {
-                let content = if full_mention_content
-                    && let MentionUri::Directory { abs_path } = &mention_uri
-                {
-                    cx.update(|cx| full_mention_for_directory(&project, abs_path, cx))?
-                        .await?
-                } else {
-                    task.await.map_err(|e| anyhow!("{e}"))?
-                };
-
-                contents.insert(crease_id, (mention_uri, content));
+                contents.insert(
+                    crease_id,
+                    (mention_uri, task.await.map_err(|e| anyhow!("{e}"))?),
+                );
             }
             Ok(contents)
         })
@@ -1696,7 +1694,7 @@ mod tests {
         });
 
         let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
             .await
             .unwrap();
 
@@ -1759,7 +1757,7 @@ mod tests {
         });
 
         let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
             .await;
 
         // Should fail because available_commands is empty (no commands supported)
@@ -1782,7 +1780,7 @@ mod tests {
         });
 
         let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
             .await;
 
         assert!(contents_result.is_err());
@@ -1797,7 +1795,7 @@ mod tests {
         });
 
         let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
             .await;
 
         // Should succeed because /help is in available_commands
@@ -1809,7 +1807,7 @@ mod tests {
         });
 
         let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
             .await
             .unwrap();
 
@@ -1827,7 +1825,7 @@ mod tests {
 
         // The @ mention functionality should not be affected
         let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
             .await
             .unwrap();
 
@@ -2273,12 +2271,9 @@ mod tests {
 
         let contents = message_editor
             .update(&mut cx, |message_editor, cx| {
-                message_editor.mention_set().contents(
-                    &all_prompt_capabilities,
-                    false,
-                    project.clone(),
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .unwrap()
@@ -2295,12 +2290,9 @@ mod tests {
 
         let contents = message_editor
             .update(&mut cx, |message_editor, cx| {
-                message_editor.mention_set().contents(
-                    &acp::PromptCapabilities::default(),
-                    false,
-                    project.clone(),
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&acp::PromptCapabilities::default(), cx)
             })
             .await
             .unwrap()
@@ -2349,12 +2341,9 @@ mod tests {
 
         let contents = message_editor
             .update(&mut cx, |message_editor, cx| {
-                message_editor.mention_set().contents(
-                    &all_prompt_capabilities,
-                    false,
-                    project.clone(),
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .unwrap()
@@ -2462,12 +2451,9 @@ mod tests {
 
         let contents = message_editor
             .update(&mut cx, |message_editor, cx| {
-                message_editor.mention_set().contents(
-                    &all_prompt_capabilities,
-                    false,
-                    project.clone(),
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .unwrap()
@@ -2515,12 +2501,9 @@ mod tests {
         // Getting the message contents fails
         message_editor
             .update(&mut cx, |message_editor, cx| {
-                message_editor.mention_set().contents(
-                    &all_prompt_capabilities,
-                    false,
-                    project.clone(),
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .expect_err("Should fail to load x.png");
@@ -2565,12 +2548,9 @@ mod tests {
         // Now getting the contents succeeds, because the invalid mention was removed
         let contents = message_editor
             .update(&mut cx, |message_editor, cx| {
-                message_editor.mention_set().contents(
-                    &all_prompt_capabilities,
-                    false,
-                    project.clone(),
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .unwrap();

crates/agent_ui/src/acp/model_selector.rs

@@ -1,6 +1,7 @@
 use std::{cmp::Reverse, rc::Rc, sync::Arc};
 
 use acp_thread::{AgentModelInfo, AgentModelList, AgentModelSelector};
+use agent_client_protocol as acp;
 use anyhow::Result;
 use collections::IndexMap;
 use futures::FutureExt;
@@ -9,19 +10,20 @@ use gpui::{Action, AsyncWindowContext, BackgroundExecutor, DismissEvent, Task, W
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
 use ui::{
-    AnyElement, App, Context, DocumentationAside, DocumentationEdge, DocumentationSide,
-    IntoElement, ListItem, ListItemSpacing, SharedString, Window, prelude::*, rems,
+    AnyElement, App, Context, IntoElement, ListItem, ListItemSpacing, SharedString, Window,
+    prelude::*, rems,
 };
 use util::ResultExt;
 
 pub type AcpModelSelector = Picker<AcpModelPickerDelegate>;
 
 pub fn acp_model_selector(
+    session_id: acp::SessionId,
     selector: Rc<dyn AgentModelSelector>,
     window: &mut Window,
     cx: &mut Context<AcpModelSelector>,
 ) -> AcpModelSelector {
-    let delegate = AcpModelPickerDelegate::new(selector, window, cx);
+    let delegate = AcpModelPickerDelegate::new(session_id, selector, window, cx);
     Picker::list(delegate, window, cx)
         .show_scrollbar(true)
         .width(rems(20.))
@@ -34,63 +36,61 @@ enum AcpModelPickerEntry {
 }
 
 pub struct AcpModelPickerDelegate {
+    session_id: acp::SessionId,
     selector: Rc<dyn AgentModelSelector>,
     filtered_entries: Vec<AcpModelPickerEntry>,
     models: Option<AgentModelList>,
     selected_index: usize,
-    selected_description: Option<(usize, SharedString)>,
     selected_model: Option<AgentModelInfo>,
     _refresh_models_task: Task<()>,
 }
 
 impl AcpModelPickerDelegate {
     fn new(
+        session_id: acp::SessionId,
         selector: Rc<dyn AgentModelSelector>,
         window: &mut Window,
         cx: &mut Context<AcpModelSelector>,
     ) -> Self {
-        let rx = selector.watch(cx);
-        let refresh_models_task = {
-            cx.spawn_in(window, {
-                async move |this, cx| {
-                    async fn refresh(
-                        this: &WeakEntity<Picker<AcpModelPickerDelegate>>,
-                        cx: &mut AsyncWindowContext,
-                    ) -> Result<()> {
-                        let (models_task, selected_model_task) = this.update(cx, |this, cx| {
-                            (
-                                this.delegate.selector.list_models(cx),
-                                this.delegate.selector.selected_model(cx),
-                            )
-                        })?;
+        let mut rx = selector.watch(cx);
+        let refresh_models_task = cx.spawn_in(window, {
+            let session_id = session_id.clone();
+            async move |this, cx| {
+                async fn refresh(
+                    this: &WeakEntity<Picker<AcpModelPickerDelegate>>,
+                    session_id: &acp::SessionId,
+                    cx: &mut AsyncWindowContext,
+                ) -> Result<()> {
+                    let (models_task, selected_model_task) = this.update(cx, |this, cx| {
+                        (
+                            this.delegate.selector.list_models(cx),
+                            this.delegate.selector.selected_model(session_id, cx),
+                        )
+                    })?;
 
-                        let (models, selected_model) =
-                            futures::join!(models_task, selected_model_task);
+                    let (models, selected_model) = futures::join!(models_task, selected_model_task);
 
-                        this.update_in(cx, |this, window, cx| {
-                            this.delegate.models = models.ok();
-                            this.delegate.selected_model = selected_model.ok();
-                            this.refresh(window, cx)
-                        })
-                    }
-
-                    refresh(&this, cx).await.log_err();
-                    if let Some(mut rx) = rx {
-                        while let Ok(()) = rx.recv().await {
-                            refresh(&this, cx).await.log_err();
-                        }
-                    }
+                    this.update_in(cx, |this, window, cx| {
+                        this.delegate.models = models.ok();
+                        this.delegate.selected_model = selected_model.ok();
+                        this.refresh(window, cx)
+                    })
                 }
-            })
-        };
+
+                refresh(&this, &session_id, cx).await.log_err();
+                while let Ok(()) = rx.recv().await {
+                    refresh(&this, &session_id, cx).await.log_err();
+                }
+            }
+        });
 
         Self {
+            session_id,
             selector,
             filtered_entries: Vec::new(),
             models: None,
             selected_model: None,
             selected_index: 0,
-            selected_description: None,
             _refresh_models_task: refresh_models_task,
         }
     }
@@ -182,7 +182,7 @@ impl PickerDelegate for AcpModelPickerDelegate {
             self.filtered_entries.get(self.selected_index)
         {
             self.selector
-                .select_model(model_info.id.clone(), cx)
+                .select_model(self.session_id.clone(), model_info.id.clone(), cx)
                 .detach_and_log_err(cx);
             self.selected_model = Some(model_info.clone());
             let current_index = self.selected_index;
@@ -233,46 +233,31 @@ impl PickerDelegate for AcpModelPickerDelegate {
                 };
 
                 Some(
-                    div()
-                        .id(("model-picker-menu-child", ix))
-                        .when_some(model_info.description.clone(), |this, description| {
-                            this
-                                .on_hover(cx.listener(move |menu, hovered, _, cx| {
-                                    if *hovered {
-                                        menu.delegate.selected_description = Some((ix, description.clone()));
-                                    } else if matches!(menu.delegate.selected_description, Some((id, _)) if id == ix) {
-                                        menu.delegate.selected_description = None;
-                                    }
-                                    cx.notify();
-                                }))
-                        })
+                    ListItem::new(ix)
+                        .inset(true)
+                        .spacing(ListItemSpacing::Sparse)
+                        .toggle_state(selected)
+                        .start_slot::<Icon>(model_info.icon.map(|icon| {
+                            Icon::new(icon)
+                                .color(model_icon_color)
+                                .size(IconSize::Small)
+                        }))
                         .child(
-                            ListItem::new(ix)
-                                .inset(true)
-                                .spacing(ListItemSpacing::Sparse)
-                                .toggle_state(selected)
-                                .start_slot::<Icon>(model_info.icon.map(|icon| {
-                                    Icon::new(icon)
-                                        .color(model_icon_color)
-                                        .size(IconSize::Small)
-                                }))
-                                .child(
-                                    h_flex()
-                                        .w_full()
-                                        .pl_0p5()
-                                        .gap_1p5()
-                                        .w(px(240.))
-                                        .child(Label::new(model_info.name.clone()).truncate()),
-                                )
-                                .end_slot(div().pr_3().when(is_selected, |this| {
-                                    this.child(
-                                        Icon::new(IconName::Check)
-                                            .color(Color::Accent)
-                                            .size(IconSize::Small),
-                                    )
-                                })),
+                            h_flex()
+                                .w_full()
+                                .pl_0p5()
+                                .gap_1p5()
+                                .w(px(240.))
+                                .child(Label::new(model_info.name.clone()).truncate()),
                         )
-                        .into_any_element()
+                        .end_slot(div().pr_3().when(is_selected, |this| {
+                            this.child(
+                                Icon::new(IconName::Check)
+                                    .color(Color::Accent)
+                                    .size(IconSize::Small),
+                            )
+                        }))
+                        .into_any_element(),
                 )
             }
         }
@@ -307,21 +292,6 @@ impl PickerDelegate for AcpModelPickerDelegate {
                 .into_any(),
         )
     }
-
-    fn documentation_aside(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<ui::DocumentationAside> {
-        self.selected_description.as_ref().map(|(_, description)| {
-            let description = description.clone();
-            DocumentationAside::new(
-                DocumentationSide::Left,
-                DocumentationEdge::Bottom,
-                Rc::new(move |_| Label::new(description.clone()).into_any_element()),
-            )
-        })
-    }
 }
 
 fn info_list_to_picker_entries(
@@ -401,7 +371,6 @@ async fn fuzzy_search(
 
 #[cfg(test)]
 mod tests {
-    use agent_client_protocol as acp;
     use gpui::TestAppContext;
 
     use super::*;
@@ -414,9 +383,8 @@ mod tests {
                     models
                         .into_iter()
                         .map(|model| acp_thread::AgentModelInfo {
-                            id: acp::ModelId(model.to_string().into()),
+                            id: acp_thread::AgentModelId(model.to_string().into()),
                             name: model.to_string().into(),
-                            description: None,
                             icon: None,
                         })
                         .collect::<Vec<_>>(),

crates/agent_ui/src/acp/model_selector_popover.rs

@@ -1,6 +1,7 @@
 use std::rc::Rc;
 
 use acp_thread::AgentModelSelector;
+use agent_client_protocol as acp;
 use gpui::{Entity, FocusHandle};
 use picker::popover_menu::PickerPopoverMenu;
 use ui::{
@@ -19,6 +20,7 @@ pub struct AcpModelSelectorPopover {
 
 impl AcpModelSelectorPopover {
     pub(crate) fn new(
+        session_id: acp::SessionId,
         selector: Rc<dyn AgentModelSelector>,
         menu_handle: PopoverMenuHandle<AcpModelSelector>,
         focus_handle: FocusHandle,
@@ -26,7 +28,7 @@ impl AcpModelSelectorPopover {
         cx: &mut Context<Self>,
     ) -> Self {
         Self {
-            selector: cx.new(move |cx| acp_model_selector(selector, window, cx)),
+            selector: cx.new(move |cx| acp_model_selector(session_id, selector, window, cx)),
             menu_handle,
             focus_handle,
         }

crates/agent_ui/src/acp/thread_view.rs

@@ -7,9 +7,9 @@ use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
 use agent_client_protocol::{self as acp, PromptCapabilities};
 use agent_servers::{AgentServer, AgentServerDelegate};
-use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
+use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
-use anyhow::{Context as _, Result, anyhow, bail};
+use anyhow::{Result, anyhow, bail};
 use arrayvec::ArrayVec;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
@@ -35,7 +35,7 @@ use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
 use project::{Project, ProjectEntryId};
 use prompt_store::{PromptId, PromptStore};
 use rope::Point;
-use settings::{NotifyWhenAgentWaiting, Settings as _, SettingsStore};
+use settings::{Settings as _, SettingsStore};
 use std::cell::RefCell;
 use std::path::Path;
 use std::sync::Arc;
@@ -577,21 +577,23 @@ impl AcpThreadView {
 
                         AgentDiff::set_active_thread(&workspace, thread.clone(), window, cx);
 
-                        this.model_selector = thread
-                            .read(cx)
-                            .connection()
-                            .model_selector(thread.read(cx).session_id())
-                            .map(|selector| {
-                                cx.new(|cx| {
-                                    AcpModelSelectorPopover::new(
-                                        selector,
-                                        PopoverMenuHandle::default(),
-                                        this.focus_handle(cx),
-                                        window,
-                                        cx,
-                                    )
-                                })
-                            });
+                        this.model_selector =
+                            thread
+                                .read(cx)
+                                .connection()
+                                .model_selector()
+                                .map(|selector| {
+                                    cx.new(|cx| {
+                                        AcpModelSelectorPopover::new(
+                                            thread.read(cx).session_id().clone(),
+                                            selector,
+                                            PopoverMenuHandle::default(),
+                                            this.focus_handle(cx),
+                                            window,
+                                            cx,
+                                        )
+                                    })
+                                });
 
                         let mode_selector = thread
                             .read(cx)
@@ -1038,7 +1040,10 @@ impl AcpThreadView {
             return;
         }
 
-        self.send_impl(self.message_editor.clone(), window, cx)
+        let contents = self
+            .message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(cx));
+        self.send_impl(contents, window, cx)
     }
 
     fn stop_current_and_send_new_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -1048,11 +1053,15 @@ impl AcpThreadView {
 
         let cancelled = thread.update(cx, |thread, cx| thread.cancel(cx));
 
+        let contents = self
+            .message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(cx));
+
         cx.spawn_in(window, async move |this, cx| {
             cancelled.await;
 
             this.update_in(cx, |this, window, cx| {
-                this.send_impl(this.message_editor.clone(), window, cx);
+                this.send_impl(contents, window, cx);
             })
             .ok();
         })
@@ -1061,23 +1070,10 @@ impl AcpThreadView {
 
     fn send_impl(
         &mut self,
-        message_editor: Entity<MessageEditor>,
+        contents: Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let full_mention_content = self.as_native_thread(cx).is_some_and(|thread| {
-            // Include full contents when using minimal profile
-            let thread = thread.read(cx);
-            AgentSettings::get_global(cx)
-                .profiles
-                .get(thread.profile())
-                .is_some_and(|profile| profile.tools.is_empty())
-        });
-
-        let contents = message_editor.update(cx, |message_editor, cx| {
-            message_editor.contents(full_mention_content, cx)
-        });
-
         let agent_telemetry_id = self.agent.telemetry_id();
 
         self.thread_error.take();
@@ -1206,8 +1202,10 @@ impl AcpThreadView {
             thread
                 .update(cx, |thread, cx| thread.rewind(user_message_id, cx))?
                 .await?;
+            let contents =
+                message_editor.update(cx, |message_editor, cx| message_editor.contents(cx))?;
             this.update_in(cx, |this, window, cx| {
-                this.send_impl(message_editor, window, cx);
+                this.send_impl(contents, window, cx);
             })?;
             anyhow::Ok(())
         })
@@ -1584,19 +1582,6 @@ impl AcpThreadView {
 
         window.spawn(cx, async move |cx| {
             let mut task = login.clone();
-            task.command = task
-                .command
-                .map(|command| anyhow::Ok(shlex::try_quote(&command)?.to_string()))
-                .transpose()?;
-            task.args = task
-                .args
-                .iter()
-                .map(|arg| {
-                    Ok(shlex::try_quote(arg)
-                        .context("Failed to quote argument")?
-                        .to_string())
-                })
-                .collect::<Result<Vec<_>>>()?;
             task.full_label = task.label.clone();
             task.id = task::TaskId(format!("external-agent-{}-login", task.label));
             task.command_label = task.label.clone();
@@ -1606,7 +1591,7 @@ impl AcpThreadView {
             task.shell = shell;
 
             let terminal = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                terminal_panel.spawn_task(&task, window, cx)
+                terminal_panel.spawn_task(login.clone(), window, cx)
             })?;
 
             let terminal = terminal.await?;
@@ -5684,6 +5669,23 @@ pub(crate) mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_spawn_external_agent_login_handles_spaces(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        // Verify paths with spaces aren't pre-quoted
+        let path_with_spaces = "/Users/test/Library/Application Support/Zed/cli.js";
+        let login_task = task::SpawnInTerminal {
+            command: Some("node".to_string()),
+            args: vec![path_with_spaces.to_string(), "/login".to_string()],
+            ..Default::default()
+        };
+
+        // Args should be passed as-is, not pre-quoted
+        assert!(!login_task.args[0].starts_with('"'));
+        assert!(!login_task.args[0].starts_with('\''));
+    }
+
     #[gpui::test]
     async fn test_notification_for_tool_authorization(cx: &mut TestAppContext) {
         init_test(cx);

crates/agent_ui/src/agent_configuration.rs

@@ -1,6 +1,5 @@
 mod add_llm_provider_modal;
 mod configure_context_server_modal;
-mod configure_context_server_tools_modal;
 mod manage_profiles_modal;
 mod tool_picker;
 
@@ -26,8 +25,12 @@ use language_model::{
 };
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
-    agent_server_store::{AgentServerStore, CLAUDE_CODE_NAME, GEMINI_NAME},
+    agent_server_store::{
+        AgentServerCommand, AgentServerStore, AllAgentServersSettings, CLAUDE_CODE_NAME,
+        CustomAgentServerSettings, GEMINI_NAME,
+    },
     context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
+    project_settings::{ContextServerSettings, ProjectSettings},
 };
 use settings::{Settings, SettingsStore, update_settings_file};
 use ui::{
@@ -39,12 +42,12 @@ use workspace::{Workspace, create_and_open_local_file};
 use zed_actions::ExtensionCategoryFilter;
 
 pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
-pub(crate) use configure_context_server_tools_modal::ConfigureContextServerToolsModal;
 pub(crate) use manage_profiles_modal::ManageProfilesModal;
 
 use crate::{
-    AddContextServer,
+    AddContextServer, ExternalAgent, NewExternalAgentThread,
     agent_configuration::add_llm_provider_modal::{AddLlmProviderModal, LlmCompatibleProvider},
+    placeholder_command,
 };
 
 pub struct AgentConfiguration {
@@ -197,8 +200,9 @@ impl AgentConfiguration {
             .when(is_expanded, |this| this.mb_2())
             .child(
                 div()
+                    .opacity(0.6)
                     .px_2()
-                    .child(Divider::horizontal().color(DividerColor::BorderFaded)),
+                    .child(Divider::horizontal().color(DividerColor::Border)),
             )
             .child(
                 h_flex()
@@ -223,7 +227,7 @@ impl AgentConfiguration {
                             .child(
                                 h_flex()
                                     .w_full()
-                                    .gap_1p5()
+                                    .gap_2()
                                     .child(
                                         Icon::new(provider.icon())
                                             .size(IconSize::Small)
@@ -341,8 +345,6 @@ impl AgentConfiguration {
                                         PopoverMenu::new("add-provider-popover")
                                             .trigger(
                                                 Button::new("add-provider", "Add Provider")
-                                                    .style(ButtonStyle::Filled)
-                                                    .layer(ElevationIndex::ModalSurface)
                                                     .icon_position(IconPosition::Start)
                                                     .icon(IconName::Plus)
                                                     .icon_size(IconSize::Small)
@@ -415,8 +417,8 @@ impl AgentConfiguration {
             always_allow_tool_actions,
             move |state, _window, cx| {
                 let allow = state == &ToggleState::Selected;
-                update_settings_file(fs.clone(), cx, move |settings, _| {
-                    settings.agent.get_or_insert_default().set_always_allow_tool_actions(allow);
+                update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
+                    settings.set_always_allow_tool_actions(allow);
                 });
             },
         )
@@ -433,11 +435,8 @@ impl AgentConfiguration {
             single_file_review,
             move |state, _window, cx| {
                 let allow = state == &ToggleState::Selected;
-                update_settings_file(fs.clone(), cx, move |settings, _| {
-                    settings
-                        .agent
-                        .get_or_insert_default()
-                        .set_single_file_review(allow);
+                update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
+                    settings.set_single_file_review(allow);
                 });
             },
         )
@@ -456,8 +455,8 @@ impl AgentConfiguration {
             play_sound_when_agent_done,
             move |state, _window, cx| {
                 let allow = state == &ToggleState::Selected;
-                update_settings_file(fs.clone(), cx, move |settings, _| {
-                    settings.agent.get_or_insert_default().set_play_sound_when_agent_done(allow);
+                update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
+                    settings.set_play_sound_when_agent_done(allow);
                 });
             },
         )
@@ -476,8 +475,8 @@ impl AgentConfiguration {
             use_modifier_to_send,
             move |state, _window, cx| {
                 let allow = state == &ToggleState::Selected;
-                update_settings_file(fs.clone(), cx, move |settings, _| {
-                    settings.agent.get_or_insert_default().set_use_modifier_to_send(allow);
+                update_settings_file::<AgentSettings>(fs.clone(), cx, move |settings, _| {
+                    settings.set_use_modifier_to_send(allow);
                 });
             },
         )
@@ -534,6 +533,10 @@ impl AgentConfiguration {
         }
     }
 
+    fn card_item_bg_color(&self, cx: &mut Context<Self>) -> Hsla {
+        cx.theme().colors().background.opacity(0.25)
+    }
+
     fn card_item_border_color(&self, cx: &mut Context<Self>) -> Hsla {
         cx.theme().colors().border.opacity(0.6)
     }
@@ -543,61 +546,7 @@ impl AgentConfiguration {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let mut context_server_ids = self
-            .context_server_store
-            .read(cx)
-            .server_ids(cx)
-            .into_iter()
-            .collect::<Vec<_>>();
-
-        // Sort context servers: ones without mcp-server- prefix first, then prefixed ones
-        context_server_ids.sort_by(|a, b| {
-            const MCP_PREFIX: &str = "mcp-server-";
-            match (a.0.strip_prefix(MCP_PREFIX), b.0.strip_prefix(MCP_PREFIX)) {
-                // If one has mcp-server- prefix and other doesn't, non-mcp comes first
-                (Some(_), None) => std::cmp::Ordering::Greater,
-                (None, Some(_)) => std::cmp::Ordering::Less,
-                // If both have same prefix status, sort by appropriate key
-                (Some(a), Some(b)) => a.cmp(b),
-                (None, None) => a.0.cmp(&b.0),
-            }
-        });
-
-        let add_server_popover = PopoverMenu::new("add-server-popover")
-            .trigger(
-                Button::new("add-server", "Add Server")
-                    .style(ButtonStyle::Filled)
-                    .layer(ElevationIndex::ModalSurface)
-                    .icon_position(IconPosition::Start)
-                    .icon(IconName::Plus)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .label_size(LabelSize::Small),
-            )
-            .anchor(gpui::Corner::TopRight)
-            .menu({
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Add Custom Server", None, {
-                            |window, cx| window.dispatch_action(AddContextServer.boxed_clone(), cx)
-                        })
-                        .entry("Install from Extensions", None, {
-                            |window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::Extensions {
-                                        category_filter: Some(
-                                            ExtensionCategoryFilter::ContextServers,
-                                        ),
-                                        id: None,
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                )
-                            }
-                        })
-                    }))
-                }
-            });
+        let context_server_ids = self.context_server_store.read(cx).configured_server_ids();
 
         v_flex()
             .p(DynamicSpacing::Base16.rems(cx))
@@ -606,25 +555,17 @@ impl AgentConfiguration {
             .border_b_1()
             .border_color(cx.theme().colors().border)
             .child(
-                h_flex()
-                    .w_full()
-                    .items_start()
-                    .justify_between()
-                    .gap_1()
+                v_flex()
+                    .gap_0p5()
+                    .child(Headline::new("Model Context Protocol (MCP) Servers"))
                     .child(
-                        v_flex()
-                            .gap_0p5()
-                            .child(Headline::new("Model Context Protocol (MCP) Servers"))
-                            .child(
-                                Label::new(
-                                    "All MCP servers connected directly or via a Zed extension.",
-                                )
-                                .color(Color::Muted),
-                            ),
-                    )
-                    .child(add_server_popover),
+                        Label::new(
+                            "All context servers connected through the Model Context Protocol.",
+                        )
+                        .color(Color::Muted),
+                    ),
             )
-            .child(v_flex().w_full().gap_1().map(|mut parent| {
+            .map(|parent| {
                 if context_server_ids.is_empty() {
                     parent.child(
                         h_flex()
@@ -641,20 +582,56 @@ impl AgentConfiguration {
                             ),
                     )
                 } else {
-                    for (index, context_server_id) in context_server_ids.into_iter().enumerate() {
-                        if index > 0 {
-                            parent = parent.child(
-                                Divider::horizontal()
-                                    .color(DividerColor::BorderFaded)
-                                    .into_any_element(),
-                            );
-                        }
-                        parent =
-                            parent.child(self.render_context_server(context_server_id, window, cx));
-                    }
-                    parent
+                    parent.children(context_server_ids.into_iter().map(|context_server_id| {
+                        self.render_context_server(context_server_id, window, cx)
+                    }))
                 }
-            }))
+            })
+            .child(
+                h_flex()
+                    .justify_between()
+                    .gap_1p5()
+                    .child(
+                        h_flex().w_full().child(
+                            Button::new("add-context-server", "Add Custom Server")
+                                .style(ButtonStyle::Filled)
+                                .layer(ElevationIndex::ModalSurface)
+                                .full_width()
+                                .icon(IconName::Plus)
+                                .icon_size(IconSize::Small)
+                                .icon_position(IconPosition::Start)
+                                .on_click(|_event, window, cx| {
+                                    window.dispatch_action(AddContextServer.boxed_clone(), cx)
+                                }),
+                        ),
+                    )
+                    .child(
+                        h_flex().w_full().child(
+                            Button::new(
+                                "install-context-server-extensions",
+                                "Install MCP Extensions",
+                            )
+                            .style(ButtonStyle::Filled)
+                            .layer(ElevationIndex::ModalSurface)
+                            .full_width()
+                            .icon(IconName::ToolHammer)
+                            .icon_size(IconSize::Small)
+                            .icon_position(IconPosition::Start)
+                            .on_click(|_event, window, cx| {
+                                window.dispatch_action(
+                                    zed_actions::Extensions {
+                                        category_filter: Some(
+                                            ExtensionCategoryFilter::ContextServers,
+                                        ),
+                                        id: None,
+                                    }
+                                    .boxed_clone(),
+                                    cx,
+                                )
+                            }),
+                        ),
+                    ),
+            )
     }
 
     fn render_context_server(
@@ -747,7 +724,7 @@ impl AgentConfiguration {
                 IconButton::new("context-server-config-menu", IconName::Settings)
                     .icon_color(Color::Muted)
                     .icon_size(IconSize::Small),
-                Tooltip::text("Configure MCP Server"),
+                Tooltip::text("Open MCP server options"),
             )
             .anchor(Corner::TopRight)
             .menu({
@@ -756,8 +733,6 @@ impl AgentConfiguration {
                 let language_registry = self.language_registry.clone();
                 let context_server_store = self.context_server_store.clone();
                 let workspace = self.workspace.clone();
-                let tools = self.tools.clone();
-
                 move |window, cx| {
                     Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
                         menu.entry("Configure Server", None, {
@@ -774,28 +749,7 @@ impl AgentConfiguration {
                                 )
                                 .detach_and_log_err(cx);
                             }
-                        }).when(tool_count >= 1, |this| this.entry("View Tools", None, {
-                            let context_server_id = context_server_id.clone();
-                            let tools = tools.clone();
-                            let workspace = workspace.clone();
-
-                            move |window, cx| {
-                                let context_server_id = context_server_id.clone();
-                                let tools = tools.clone();
-                                let workspace = workspace.clone();
-
-                                workspace.update(cx, |workspace, cx| {
-                                    ConfigureContextServerToolsModal::toggle(
-                                        context_server_id,
-                                        tools,
-                                        workspace,
-                                        window,
-                                        cx,
-                                    );
-                                })
-                                .ok();
-                            }
-                        }))
+                        })
                         .separator()
                         .entry("Uninstall", None, {
                             let fs = fs.clone();
@@ -841,14 +795,14 @@ impl AgentConfiguration {
                                     async move |cx| {
                                         uninstall_extension_task.await?;
                                         cx.update(|cx| {
-                                            update_settings_file(
+                                            update_settings_file::<ProjectSettings>(
                                                 fs.clone(),
                                                 cx,
                                                 {
                                                     let context_server_id =
                                                         context_server_id.clone();
                                                     move |settings, _| {
-                                                        settings.project
+                                                        settings
                                                             .context_servers
                                                             .remove(&context_server_id.0);
                                                     }
@@ -866,11 +820,17 @@ impl AgentConfiguration {
 
         v_flex()
             .id(item_id.clone())
+            .border_1()
+            .rounded_md()
+            .border_color(self.card_item_border_color(cx))
+            .bg(self.card_item_bg_color(cx))
+            .overflow_hidden()
             .child(
                 h_flex()
+                    .p_1()
                     .justify_between()
                     .when(
-                        error.is_none() && are_tools_expanded && tool_count >= 1,
+                        error.is_some() || are_tools_expanded && tool_count >= 1,
                         |element| {
                             element
                                 .border_b_1()
@@ -881,12 +841,31 @@ impl AgentConfiguration {
                         h_flex()
                             .flex_1()
                             .min_w_0()
+                            .child(
+                                Disclosure::new(
+                                    "tool-list-disclosure",
+                                    are_tools_expanded || error.is_some(),
+                                )
+                                .disabled(tool_count == 0)
+                                .on_click(cx.listener({
+                                    let context_server_id = context_server_id.clone();
+                                    move |this, _event, _window, _cx| {
+                                        let is_open = this
+                                            .expanded_context_server_tools
+                                            .entry(context_server_id.clone())
+                                            .or_insert(false);
+
+                                        *is_open = !*is_open;
+                                    }
+                                })),
+                            )
                             .child(
                                 h_flex()
                                     .id(SharedString::from(format!("tooltip-{}", item_id)))
                                     .h_full()
                                     .w_3()
-                                    .mr_2()
+                                    .ml_1()
+                                    .mr_1p5()
                                     .justify_center()
                                     .tooltip(Tooltip::text(tooltip_text))
                                     .child(status_indicator),
@@ -923,61 +902,75 @@ impl AgentConfiguration {
                             .flex_none()
                             .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();
+                                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();
 
-                                    move |state, _window, cx| {
-                                        let is_enabled = match state {
-                                            ToggleState::Unselected
-                                            | ToggleState::Indeterminate => {
-                                                context_server_manager.update(cx, |this, cx| {
-                                                    this.stop_server(&context_server_id, cx)
-                                                        .log_err();
-                                                });
-                                                false
-                                            }
-                                            ToggleState::Selected => {
-                                                context_server_manager.update(cx, |this, cx| {
-                                                    if let Some(server) =
-                                                        this.get_server(&context_server_id)
-                                                    {
-                                                        this.start_server(server, cx);
+                                        move |state, _window, cx| {
+                                            let is_enabled = match state {
+                                                ToggleState::Unselected
+                                                | ToggleState::Indeterminate => {
+                                                    context_server_manager.update(
+                                                        cx,
+                                                        |this, cx| {
+                                                            this.stop_server(
+                                                                &context_server_id,
+                                                                cx,
+                                                            )
+                                                            .log_err();
+                                                        },
+                                                    );
+                                                    false
+                                                }
+                                                ToggleState::Selected => {
+                                                    context_server_manager.update(
+                                                        cx,
+                                                        |this, cx| {
+                                                            if let Some(server) =
+                                                                this.get_server(&context_server_id)
+                                                            {
+                                                                this.start_server(server, cx);
+                                                            }
+                                                        },
+                                                    );
+                                                    true
+                                                }
+                                            };
+                                            update_settings_file::<ProjectSettings>(
+                                                fs.clone(),
+                                                cx,
+                                                {
+                                                    let context_server_id =
+                                                        context_server_id.clone();
+
+                                                    move |settings, _| {
+                                                        settings
+                                                            .context_servers
+                                                            .entry(context_server_id.0)
+                                                            .or_insert_with(|| {
+                                                                ContextServerSettings::Extension {
+                                                                    enabled: is_enabled,
+                                                                    settings: serde_json::json!({}),
+                                                                }
+                                                            })
+                                                            .set_enabled(is_enabled);
                                                     }
-                                                });
-                                                true
-                                            }
-                                        };
-                                        update_settings_file(fs.clone(), cx, {
-                                            let context_server_id = context_server_id.clone();
-
-                                            move |settings, _| {
-                                                settings
-                                                    .project
-                                                    .context_servers
-                                                    .entry(context_server_id.0)
-                                                    .or_insert_with(|| {
-                                                        settings::ContextServerSettingsContent::Extension {
-                                                            enabled: is_enabled,
-                                                            settings: serde_json::json!({}),
-                                                        }
-                                                    })
-                                                    .set_enabled(is_enabled);
-                                            }
-                                        });
-                                    }
-                                }),
-                        ),
+                                                },
+                                            );
+                                        }
+                                    }),
+                            ),
                     ),
             )
             .map(|parent| {
                 if let Some(error) = error {
                     return parent.child(
                         h_flex()
+                            .p_2()
                             .gap_2()
-                            .pr_4()
                             .items_start()
                             .child(
                                 h_flex()
@@ -1005,11 +998,37 @@ impl AgentConfiguration {
                     return parent;
                 }
 
-                parent
+                parent.child(v_flex().py_1p5().px_1().gap_1().children(
+                    tools.iter().enumerate().map(|(ix, tool)| {
+                        h_flex()
+                            .id(("tool-item", ix))
+                            .px_1()
+                            .gap_2()
+                            .justify_between()
+                            .hover(|style| style.bg(cx.theme().colors().element_hover))
+                            .rounded_sm()
+                            .child(
+                                Label::new(tool.name())
+                                    .buffer_font(cx)
+                                    .size(LabelSize::Small),
+                            )
+                            .child(
+                                Icon::new(IconName::Info)
+                                    .size(IconSize::Small)
+                                    .color(Color::Ignored),
+                            )
+                            .tooltip(Tooltip::text(tool.description()))
+                    }),
+                ))
             })
     }
 
     fn render_agent_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let custom_settings = cx
+            .global::<SettingsStore>()
+            .get::<AllAgentServersSettings>(None)
+            .custom
+            .clone();
         let user_defined_agents = self
             .agent_server_store
             .read(cx)
@@ -1017,12 +1036,22 @@ impl AgentConfiguration {
             .filter(|name| name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME)
             .cloned()
             .collect::<Vec<_>>();
-
         let user_defined_agents = user_defined_agents
             .into_iter()
             .map(|name| {
-                self.render_agent_server(IconName::Ai, name)
-                    .into_any_element()
+                self.render_agent_server(
+                    IconName::Ai,
+                    name.clone(),
+                    ExternalAgent::Custom {
+                        name: name.clone().into(),
+                        command: custom_settings
+                            .get(&name.0)
+                            .map(|settings| settings.command.clone())
+                            .unwrap_or(placeholder_command()),
+                    },
+                    cx,
+                )
+                .into_any_element()
             })
             .collect::<Vec<_>>();
 
@@ -1046,8 +1075,6 @@ impl AgentConfiguration {
                                     .child(Headline::new("External Agents"))
                                     .child(
                                         Button::new("add-agent", "Add Agent")
-                                            .style(ButtonStyle::Filled)
-                                            .layer(ElevationIndex::ModalSurface)
                                             .icon_position(IconPosition::Start)
                                             .icon(IconName::Plus)
                                             .icon_size(IconSize::Small)
@@ -1080,19 +1107,16 @@ impl AgentConfiguration {
                     .child(self.render_agent_server(
                         IconName::AiGemini,
                         "Gemini CLI",
+                        ExternalAgent::Gemini,
+                        cx,
                     ))
-                    .child(Divider::horizontal().color(DividerColor::BorderFaded))
                     .child(self.render_agent_server(
                         IconName::AiClaude,
                         "Claude Code",
+                        ExternalAgent::ClaudeCode,
+                        cx,
                     ))
-                    .map(|mut parent| {
-                        for agent in user_defined_agents {
-                            parent = parent.child(Divider::horizontal().color(DividerColor::BorderFaded))
-                                .child(agent);
-                        }
-                        parent
-                    })
+                    .children(user_defined_agents),
             )
     }
 
@@ -1100,18 +1124,47 @@ impl AgentConfiguration {
         &self,
         icon: IconName,
         name: impl Into<SharedString>,
+        agent: ExternalAgent,
+        cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        h_flex().gap_1p5().justify_between().child(
-            h_flex()
-                .gap_1p5()
-                .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
-                .child(Label::new(name.into()))
-                .child(
-                    Icon::new(IconName::Check)
-                        .size(IconSize::Small)
-                        .color(Color::Success),
-                ),
-        )
+        let name = name.into();
+        h_flex()
+            .p_1()
+            .pl_2()
+            .gap_1p5()
+            .justify_between()
+            .border_1()
+            .rounded_md()
+            .border_color(self.card_item_border_color(cx))
+            .bg(self.card_item_bg_color(cx))
+            .overflow_hidden()
+            .child(
+                h_flex()
+                    .gap_1p5()
+                    .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
+                    .child(Label::new(name.clone())),
+            )
+            .child(
+                Button::new(
+                    SharedString::from(format!("start_acp_thread-{name}")),
+                    "Start New Thread",
+                )
+                .layer(ElevationIndex::ModalSurface)
+                .label_size(LabelSize::Small)
+                .icon(IconName::Thread)
+                .icon_position(IconPosition::Start)
+                .icon_size(IconSize::XSmall)
+                .icon_color(Color::Muted)
+                .on_click(move |_, window, cx| {
+                    window.dispatch_action(
+                        NewExternalAgentThread {
+                            agent: Some(agent.clone()),
+                        }
+                        .boxed_clone(),
+                        cx,
+                    );
+                }),
+            )
     }
 }
 
@@ -1207,12 +1260,15 @@ fn show_unable_to_uninstall_extension_with_context_server(
                                     let context_server_id = context_server_id.clone();
                                     async move |_workspace_handle, cx| {
                                         cx.update(|cx| {
-                                            update_settings_file(fs, cx, move |settings, _| {
-                                                settings
-                                                    .project
-                                                    .context_servers
-                                                    .remove(&context_server_id.0);
-                                            });
+                                            update_settings_file::<ProjectSettings>(
+                                                fs,
+                                                cx,
+                                                move |settings, _| {
+                                                    settings
+                                                        .context_servers
+                                                        .remove(&context_server_id.0);
+                                                },
+                                            );
                                         })?;
                                         anyhow::Ok(())
                                     }
@@ -1250,7 +1306,7 @@ async fn open_new_agent_servers_entry_in_settings_editor(
             let settings = cx.global::<SettingsStore>();
 
             let mut unique_server_name = None;
-            let edits = settings.edits_for_update(&text, |settings| {
+            let edits = settings.edits_for_update::<AllAgentServersSettings>(&text, |file| {
                 let server_name: Option<SharedString> = (0..u8::MAX)
                     .map(|i| {
                         if i == 0 {
@@ -1259,27 +1315,20 @@ async fn open_new_agent_servers_entry_in_settings_editor(
                             format!("your_agent_{}", i).into()
                         }
                     })
-                    .find(|name| {
-                        !settings
-                            .agent_servers
-                            .as_ref()
-                            .is_some_and(|agent_servers| agent_servers.custom.contains_key(name))
-                    });
+                    .find(|name| !file.custom.contains_key(name));
                 if let Some(server_name) = server_name {
                     unique_server_name = Some(server_name.clone());
-                    settings
-                        .agent_servers
-                        .get_or_insert_default()
-                        .custom
-                        .insert(
-                            server_name,
-                            settings::CustomAgentServerSettings {
+                    file.custom.insert(
+                        server_name,
+                        CustomAgentServerSettings {
+                            command: AgentServerCommand {
                                 path: "path_to_executable".into(),
                                 args: vec![],
                                 env: Some(HashMap::default()),
-                                default_mode: None,
                             },
-                        );
+                            default_mode: None,
+                        },
+                    );
                 }
             });
 

crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs

@@ -5,8 +5,11 @@ use collections::HashSet;
 use fs::Fs;
 use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, Task};
 use language_model::LanguageModelRegistry;
-use language_models::provider::open_ai_compatible::{AvailableModel, ModelCapabilities};
-use settings::{OpenAiCompatibleSettingsContent, update_settings_file};
+use language_models::{
+    AllLanguageModelSettings, OpenAiCompatibleSettingsContent,
+    provider::open_ai_compatible::{AvailableModel, ModelCapabilities},
+};
+use settings::update_settings_file;
 use ui::{
     Banner, Checkbox, KeyBinding, Modal, ModalFooter, ModalHeader, Section, ToggleState, prelude::*,
 };
@@ -235,19 +238,14 @@ fn save_provider_to_settings(
         task.await
             .map_err(|_| "Failed to write API key to keychain")?;
         cx.update(|cx| {
-            update_settings_file(fs, cx, |settings, _cx| {
-                settings
-                    .language_models
-                    .get_or_insert_default()
-                    .openai_compatible
-                    .get_or_insert_default()
-                    .insert(
-                        provider_name,
-                        OpenAiCompatibleSettingsContent {
-                            api_url,
-                            available_models: models,
-                        },
-                    );
+            update_settings_file::<AllLanguageModelSettings>(fs, cx, |settings, _cx| {
+                settings.openai_compatible.get_or_insert_default().insert(
+                    provider_name,
+                    OpenAiCompatibleSettingsContent {
+                        api_url,
+                        available_models: models,
+                    },
+                );
             });
         })
         .ok();

crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs

@@ -422,17 +422,18 @@ impl ConfigureContextServerModal {
             workspace.update(cx, |workspace, cx| {
                 let fs = workspace.app_state().fs.clone();
                 let original_server_id = self.original_server_id.clone();
-                update_settings_file(fs.clone(), cx, move |current, _| {
-                    if let Some(original_id) = original_server_id {
-                        if original_id != id {
-                            current.project.context_servers.remove(&original_id.0);
+                update_settings_file::<ProjectSettings>(
+                    fs.clone(),
+                    cx,
+                    move |project_settings, _| {
+                        if let Some(original_id) = original_server_id {
+                            if original_id != id {
+                                project_settings.context_servers.remove(&original_id.0);
+                            }
                         }
-                    }
-                    current
-                        .project
-                        .context_servers
-                        .insert(id.0, settings.into());
-                });
+                        project_settings.context_servers.insert(id.0, settings);
+                    },
+                );
             });
         } else if let Some(existing_server) = existing_server {
             self.context_server_store

crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs

@@ -1,176 +0,0 @@
-use assistant_tool::{ToolSource, ToolWorkingSet};
-use context_server::ContextServerId;
-use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle, Window, prelude::*,
-};
-use ui::{Divider, DividerColor, Modal, ModalHeader, WithScrollbar, prelude::*};
-use workspace::{ModalView, Workspace};
-
-pub struct ConfigureContextServerToolsModal {
-    context_server_id: ContextServerId,
-    tools: Entity<ToolWorkingSet>,
-    focus_handle: FocusHandle,
-    expanded_tools: std::collections::HashMap<String, bool>,
-    scroll_handle: ScrollHandle,
-}
-
-impl ConfigureContextServerToolsModal {
-    fn new(
-        context_server_id: ContextServerId,
-        tools: Entity<ToolWorkingSet>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            context_server_id,
-            tools,
-            focus_handle: cx.focus_handle(),
-            expanded_tools: std::collections::HashMap::new(),
-            scroll_handle: ScrollHandle::new(),
-        }
-    }
-
-    pub fn toggle(
-        context_server_id: ContextServerId,
-        tools: Entity<ToolWorkingSet>,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        workspace.toggle_modal(window, cx, |window, cx| {
-            Self::new(context_server_id, tools, window, cx)
-        });
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent)
-    }
-
-    fn render_modal_content(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let tools_by_source = self.tools.read(cx).tools_by_source(cx);
-        let server_tools = tools_by_source
-            .get(&ToolSource::ContextServer {
-                id: self.context_server_id.0.clone().into(),
-            })
-            .map(|tools| tools.as_slice())
-            .unwrap_or(&[]);
-
-        div()
-            .size_full()
-            .pb_2()
-            .child(
-                v_flex()
-                    .id("modal_content")
-                    .px_2()
-                    .gap_1()
-                    .max_h_128()
-                    .overflow_y_scroll()
-                    .track_scroll(&self.scroll_handle)
-                    .children(server_tools.iter().enumerate().flat_map(|(index, tool)| {
-                        let tool_name = tool.name();
-                        let is_expanded = self
-                            .expanded_tools
-                            .get(&tool_name)
-                            .copied()
-                            .unwrap_or(false);
-
-                        let icon = if is_expanded {
-                            IconName::ChevronUp
-                        } else {
-                            IconName::ChevronDown
-                        };
-
-                        let mut items = vec![
-                            v_flex()
-                                .child(
-                                    h_flex()
-                                        .id(SharedString::from(format!("tool-header-{}", index)))
-                                        .py_1()
-                                        .pl_1()
-                                        .pr_2()
-                                        .w_full()
-                                        .justify_between()
-                                        .rounded_sm()
-                                        .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                        .child(
-                                            Label::new(tool_name.clone())
-                                                .buffer_font(cx)
-                                                .size(LabelSize::Small),
-                                        )
-                                        .child(
-                                            Icon::new(icon)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .on_click(cx.listener({
-                                            move |this, _event, _window, _cx| {
-                                                let current = this
-                                                    .expanded_tools
-                                                    .get(&tool_name)
-                                                    .copied()
-                                                    .unwrap_or(false);
-                                                this.expanded_tools
-                                                    .insert(tool_name.clone(), !current);
-                                                _cx.notify();
-                                            }
-                                        })),
-                                )
-                                .when(is_expanded, |this| {
-                                    this.child(
-                                        Label::new(tool.description()).color(Color::Muted).mx_1(),
-                                    )
-                                })
-                                .into_any_element(),
-                        ];
-
-                        if index < server_tools.len() - 1 {
-                            items.push(
-                                h_flex()
-                                    .w_full()
-                                    .child(Divider::horizontal().color(DividerColor::BorderVariant))
-                                    .into_any_element(),
-                            );
-                        }
-
-                        items
-                    })),
-            )
-            .vertical_scrollbar_for(self.scroll_handle.clone(), window, cx)
-            .into_any_element()
-    }
-}
-
-impl ModalView for ConfigureContextServerToolsModal {}
-
-impl Focusable for ConfigureContextServerToolsModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<DismissEvent> for ConfigureContextServerToolsModal {}
-
-impl Render for ConfigureContextServerToolsModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .key_context("ContextServerToolsModal")
-            .occlude()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .on_action(cx.listener(Self::cancel))
-            .track_focus(&self.focus_handle)
-            .child(
-                Modal::new("configure-context-server-tools", None::<ScrollHandle>)
-                    .header(
-                        ModalHeader::new()
-                            .headline(format!("Tools from {}", self.context_server_id.0))
-                            .show_dismiss_button(true),
-                    )
-                    .child(self.render_modal_content(window, cx)),
-            )
-    }
-}

crates/agent_ui/src/agent_configuration/tool_picker.rs

@@ -1,11 +1,14 @@
 use std::{collections::BTreeMap, sync::Arc};
 
-use agent_settings::{AgentProfileId, AgentProfileSettings};
+use agent_settings::{
+    AgentProfileContent, AgentProfileId, AgentProfileSettings, AgentSettings, AgentSettingsContent,
+    ContextServerPresetContent,
+};
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use fs::Fs;
 use gpui::{App, Context, DismissEvent, Entity, EventEmitter, Focusable, Task, WeakEntity, Window};
 use picker::{Picker, PickerDelegate};
-use settings::{AgentProfileContent, ContextServerPresetContent, update_settings_file};
+use settings::update_settings_file;
 use ui::{ListItem, ListItemSpacing, prelude::*};
 use util::ResultExt as _;
 
@@ -263,19 +266,15 @@ impl PickerDelegate for ToolPickerDelegate {
             is_enabled
         };
 
-        update_settings_file(self.fs.clone(), cx, {
+        update_settings_file::<AgentSettings>(self.fs.clone(), cx, {
             let profile_id = self.profile_id.clone();
             let default_profile = self.profile_settings.clone();
             let server_id = server_id.clone();
             let tool_name = tool_name.clone();
-            move |settings, _cx| {
-                let profiles = settings
-                    .agent
-                    .get_or_insert_default()
-                    .profiles
-                    .get_or_insert_default();
+            move |settings: &mut AgentSettingsContent, _cx| {
+                let profiles = settings.profiles.get_or_insert_default();
                 let profile = profiles
-                    .entry(profile_id.0)
+                    .entry(profile_id)
                     .or_insert_with(|| AgentProfileContent {
                         name: default_profile.name.into(),
                         tools: default_profile.tools,

crates/agent_ui/src/agent_model_selector.rs

@@ -2,6 +2,7 @@ use crate::{
     ModelUsageContext,
     language_model_selector::{LanguageModelSelector, language_model_selector},
 };
+use agent_settings::AgentSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};
 use picker::popover_menu::PickerPopoverMenu;
@@ -38,12 +39,14 @@ impl AgentModelSelector {
                         let model_id = model.id().0.to_string();
                         match &model_usage_context {
                             ModelUsageContext::InlineAssistant => {
-                                update_settings_file(fs.clone(), cx, move |settings, _cx| {
-                                    settings
-                                        .agent
-                                        .get_or_insert_default()
-                                        .set_inline_assistant_model(provider.clone(), model_id);
-                                });
+                                update_settings_file::<AgentSettings>(
+                                    fs.clone(),
+                                    cx,
+                                    move |settings, _cx| {
+                                        settings
+                                            .set_inline_assistant_model(provider.clone(), model_id);
+                                    },
+                                );
                             }
                         }
                     },

crates/agent_ui/src/agent_panel.rs

@@ -1,4 +1,4 @@
-use std::ops::Range;
+use std::ops::{Not, Range};
 use std::path::Path;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -10,9 +10,6 @@ use project::agent_server_store::{
     AgentServerCommand, AllAgentServersSettings, CLAUDE_CODE_NAME, GEMINI_NAME,
 };
 use serde::{Deserialize, Serialize};
-use settings::{
-    DefaultAgentView as DefaultView, LanguageModelProviderSetting, LanguageModelSelection,
-};
 use zed_actions::OpenBrowser;
 use zed_actions::agent::{OpenClaudeCodeOnboardingModal, ReauthenticateAgent};
 
@@ -36,7 +33,7 @@ use agent::{
     history_store::{HistoryEntryId, HistoryStore},
     thread_store::{TextThreadStore, ThreadStore},
 };
-use agent_settings::AgentSettings;
+use agent_settings::{AgentDockPosition, AgentSettings, DefaultView};
 use ai_onboarding::AgentPanelOnboarding;
 use anyhow::{Result, anyhow};
 use assistant_context::{AssistantContext, ContextEvent, ContextSummary};
@@ -408,7 +405,6 @@ impl ActiveView {
 
 pub struct AgentPanel {
     workspace: WeakEntity<Workspace>,
-    loading: bool,
     user_store: Entity<UserStore>,
     project: Entity<Project>,
     fs: Arc<dyn Fs>,
@@ -514,7 +510,6 @@ impl AgentPanel {
                         cx,
                     )
                 });
-                panel.as_mut(cx).loading = true;
                 if let Some(serialized_panel) = serialized_panel {
                     panel.update(cx, |panel, cx| {
                         panel.width = serialized_panel.width.map(|w| w.round());
@@ -529,7 +524,6 @@ impl AgentPanel {
                         panel.new_agent_thread(AgentType::NativeAgent, window, cx);
                     });
                 }
-                panel.as_mut(cx).loading = false;
                 panel
             })?;
 
@@ -665,43 +659,6 @@ impl AgentPanel {
             )
         });
 
-        let mut old_disable_ai = false;
-        cx.observe_global_in::<SettingsStore>(window, move |panel, window, cx| {
-            let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
-            if old_disable_ai != disable_ai {
-                let agent_panel_id = cx.entity_id();
-                let agent_panel_visible = panel
-                    .workspace
-                    .update(cx, |workspace, cx| {
-                        let agent_dock_position = panel.position(window, cx);
-                        let agent_dock = workspace.dock_at_position(agent_dock_position);
-                        let agent_panel_focused = agent_dock
-                            .read(cx)
-                            .active_panel()
-                            .is_some_and(|panel| panel.panel_id() == agent_panel_id);
-
-                        let active_panel_visible = agent_dock
-                            .read(cx)
-                            .visible_panel()
-                            .is_some_and(|panel| panel.panel_id() == agent_panel_id);
-
-                        if agent_panel_focused {
-                            cx.dispatch_action(&ToggleFocus);
-                        }
-
-                        active_panel_visible
-                    })
-                    .unwrap_or_default();
-
-                if agent_panel_visible {
-                    cx.emit(PanelEvent::Close);
-                }
-
-                old_disable_ai = disable_ai;
-            }
-        })
-        .detach();
-
         Self {
             active_view,
             workspace,
@@ -714,9 +671,11 @@ impl AgentPanel {
             prompt_store,
             configuration: None,
             configuration_subscription: None,
+
             inline_assist_context_store,
             previous_view: None,
             history_store: history_store.clone(),
+
             new_thread_menu_handle: PopoverMenuHandle::default(),
             agent_panel_menu_handle: PopoverMenuHandle::default(),
             assistant_navigation_menu_handle: PopoverMenuHandle::default(),
@@ -729,7 +688,6 @@ impl AgentPanel {
             acp_history,
             acp_history_store,
             selected_agent: AgentType::default(),
-            loading: false,
         }
     }
 
@@ -742,6 +700,7 @@ impl AgentPanel {
         if workspace
             .panel::<Self>(cx)
             .is_some_and(|panel| panel.read(cx).enabled(cx))
+            && !DisableAiSettings::get_global(cx).disable_ai
         {
             workspace.toggle_panel_focus::<Self>(window, cx);
         }
@@ -861,7 +820,6 @@ impl AgentPanel {
             agent: crate::ExternalAgent,
         }
 
-        let loading = self.loading;
         let history = self.acp_history_store.clone();
 
         cx.spawn_in(window, async move |this, cx| {
@@ -903,9 +861,7 @@ impl AgentPanel {
                 }
             };
 
-            if !loading {
-                telemetry::event!("Agent Thread Started", agent = ext_agent.name());
-            }
+            telemetry::event!("Agent Thread Started", agent = ext_agent.name());
 
             let server = ext_agent.server(fs, history);
 
@@ -1102,14 +1058,17 @@ impl AgentPanel {
         match self.active_view.which_font_size_used() {
             WhichFontSize::AgentFont => {
                 if persist {
-                    update_settings_file(self.fs.clone(), cx, move |settings, cx| {
-                        let agent_font_size =
-                            ThemeSettings::get_global(cx).agent_font_size(cx) + delta;
-                        let _ = settings
-                            .theme
-                            .agent_font_size
-                            .insert(theme::clamp_font_size(agent_font_size).into());
-                    });
+                    update_settings_file::<ThemeSettings>(
+                        self.fs.clone(),
+                        cx,
+                        move |settings, cx| {
+                            let agent_font_size =
+                                ThemeSettings::get_global(cx).agent_font_size(cx) + delta;
+                            let _ = settings
+                                .agent_font_size
+                                .insert(Some(theme::clamp_font_size(agent_font_size).into()));
+                        },
+                    );
                 } else {
                     theme::adjust_agent_font_size(cx, |size| size + delta);
                 }
@@ -1130,8 +1089,8 @@ impl AgentPanel {
         cx: &mut Context<Self>,
     ) {
         if action.persist {
-            update_settings_file(self.fs.clone(), cx, move |settings, _| {
-                settings.theme.agent_font_size = None;
+            update_settings_file::<ThemeSettings>(self.fs.clone(), cx, move |settings, _| {
+                settings.agent_font_size = None;
             });
         } else {
             theme::reset_agent_font_size(cx);
@@ -1216,17 +1175,11 @@ impl AgentPanel {
                     .is_none_or(|model| model.provider.id() != provider.id())
                     && let Some(model) = provider.default_model(cx)
                 {
-                    update_settings_file(self.fs.clone(), cx, move |settings, _| {
-                        let provider = model.provider_id().0.to_string();
-                        let model = model.id().0.to_string();
-                        settings
-                            .agent
-                            .get_or_insert_default()
-                            .set_model(LanguageModelSelection {
-                                provider: LanguageModelProviderSetting(provider),
-                                model,
-                            })
-                    });
+                    update_settings_file::<AgentSettings>(
+                        self.fs.clone(),
+                        cx,
+                        move |settings, _| settings.set_model(model),
+                    );
                 }
 
                 self.new_thread(&NewThread::default(), window, cx);
@@ -1471,7 +1424,11 @@ impl Focusable for AgentPanel {
 }
 
 fn agent_panel_dock_position(cx: &App) -> DockPosition {
-    AgentSettings::get_global(cx).dock.into()
+    match AgentSettings::get_global(cx).dock {
+        AgentDockPosition::Left => DockPosition::Left,
+        AgentDockPosition::Bottom => DockPosition::Bottom,
+        AgentDockPosition::Right => DockPosition::Right,
+    }
 }
 
 impl EventEmitter<PanelEvent> for AgentPanel {}
@@ -1490,11 +1447,13 @@ impl Panel for AgentPanel {
     }
 
     fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            settings
-                .agent
-                .get_or_insert_default()
-                .set_dock(position.into());
+        settings::update_settings_file::<AgentSettings>(self.fs.clone(), cx, move |settings, _| {
+            let dock = match position {
+                DockPosition::Left => AgentDockPosition::Left,
+                DockPosition::Bottom => AgentDockPosition::Bottom,
+                DockPosition::Right => AgentDockPosition::Right,
+            };
+            settings.set_dock(dock);
         });
     }
 
@@ -1540,7 +1499,7 @@ impl Panel for AgentPanel {
     }
 
     fn enabled(&self, cx: &App) -> bool {
-        AgentSettings::get_global(cx).enabled(cx)
+        DisableAiSettings::get_global(cx).disable_ai.not() && AgentSettings::get_global(cx).enabled
     }
 
     fn is_zoomed(&self, _window: &Window, _cx: &App) -> bool {

crates/agent_ui/src/agent_ui.rs

@@ -14,6 +14,7 @@ mod message_editor;
 mod profile_selector;
 mod slash_command;
 mod slash_command_picker;
+mod slash_command_settings;
 mod terminal_codegen;
 mod terminal_inline_assistant;
 mod text_thread_editor;
@@ -23,7 +24,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use agent::ThreadId;
-use agent_settings::{AgentProfileId, AgentSettings};
+use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
@@ -39,12 +40,13 @@ use project::agent_server_store::AgentServerCommand;
 use prompt_store::PromptBuilder;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{LanguageModelSelection, Settings as _, SettingsStore};
+use settings::{Settings as _, SettingsStore};
 use std::any::TypeId;
 
 use crate::agent_configuration::{ConfigureContextServerModal, ManageProfilesModal};
 pub use crate::agent_panel::{AgentPanel, ConcreteAssistantPanelDelegate};
 pub use crate::inline_assistant::InlineAssistant;
+use crate::slash_command_settings::SlashCommandSettings;
 pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
 pub use text_thread_editor::{AgentPanelDelegate, TextThreadEditor};
 use zed_actions;
@@ -255,6 +257,7 @@ pub fn init(
     cx: &mut App,
 ) {
     AgentSettings::register(cx);
+    SlashCommandSettings::register(cx);
 
     assistant_context::init(client.clone(), cx);
     rules_library::init(cx);
@@ -410,6 +413,8 @@ fn register_slash_commands(cx: &mut App) {
     slash_command_registry.register_command(assistant_slash_commands::DeltaSlashCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::OutlineSlashCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::TabSlashCommand, true);
+    slash_command_registry
+        .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
@@ -429,4 +434,21 @@ fn register_slash_commands(cx: &mut App) {
         }
     })
     .detach();
+
+    update_slash_commands_from_settings(cx);
+    cx.observe_global::<SettingsStore>(update_slash_commands_from_settings)
+        .detach();
+}
+
+fn update_slash_commands_from_settings(cx: &mut App) {
+    let slash_command_registry = SlashCommandRegistry::global(cx);
+    let settings = SlashCommandSettings::get_global(cx);
+
+    if settings.cargo_workspace.enabled {
+        slash_command_registry
+            .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
+    } else {
+        slash_command_registry
+            .unregister_command(assistant_slash_commands::CargoWorkspaceSlashCommand);
+    }
 }

crates/agent_ui/src/context_picker/completion_provider.rs

@@ -743,15 +743,15 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         _window: &mut Window,
         cx: &mut Context<Editor>,
     ) -> Task<Result<Vec<CompletionResponse>>> {
-        let snapshot = buffer.read(cx).snapshot();
-        let position = buffer_position.to_point(&snapshot);
-        let line_start = Point::new(position.row, 0);
-        let offset_to_line = snapshot.point_to_offset(line_start);
-        let mut lines = snapshot.text_for_range(line_start..position).lines();
-        let Some(line) = lines.next() else {
-            return Task::ready(Ok(Vec::new()));
-        };
-        let Some(state) = MentionCompletion::try_parse(line, offset_to_line) else {
+        let state = buffer.update(cx, |buffer, _cx| {
+            let position = buffer_position.to_point(buffer);
+            let line_start = Point::new(position.row, 0);
+            let offset_to_line = buffer.point_to_offset(line_start);
+            let mut lines = buffer.text_for_range(line_start..position).lines();
+            let line = lines.next()?;
+            MentionCompletion::try_parse(line, offset_to_line)
+        });
+        let Some(state) = state else {
             return Task::ready(Ok(Vec::new()));
         };
 
@@ -761,6 +761,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             return Task::ready(Ok(Vec::new()));
         };
 
+        let snapshot = buffer.read(cx).snapshot();
         let source_range = snapshot.anchor_before(state.source_range.start)
             ..snapshot.anchor_after(state.source_range.end);
 

crates/agent_ui/src/context_picker/file_context_picker.rs

@@ -251,7 +251,7 @@ pub(crate) fn search_files(
             fuzzy::match_path_sets(
                 candidate_sets.as_slice(),
                 query.as_str(),
-                &None,
+                None,
                 false,
                 100,
                 &cancellation_flag,

crates/agent_ui/src/context_server_configuration.rs

@@ -5,6 +5,7 @@ use extension::ExtensionManifest;
 use fs::Fs;
 use gpui::WeakEntity;
 use language::LanguageRegistry;
+use project::project_settings::ProjectSettings;
 use settings::update_settings_file;
 use ui::prelude::*;
 use util::ResultExt;
@@ -68,9 +69,8 @@ fn remove_context_server_settings(
     fs: Arc<dyn Fs>,
     cx: &mut App,
 ) {
-    update_settings_file(fs, cx, move |settings, _| {
+    update_settings_file::<ProjectSettings>(fs, cx, move |settings, _| {
         settings
-            .project
             .context_servers
             .retain(|server_id, _| !context_server_ids.contains(server_id));
     });

crates/agent_ui/src/inline_assistant.rs

@@ -144,7 +144,8 @@ impl InlineAssistant {
             let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
                 return;
             };
-            let enabled = AgentSettings::get_global(cx).enabled(cx);
+            let enabled = !DisableAiSettings::get_global(cx).disable_ai
+                && AgentSettings::get_global(cx).enabled;
             terminal_panel.update(cx, |terminal_panel, cx| {
                 terminal_panel.set_assistant_enabled(enabled, cx)
             });
@@ -256,7 +257,8 @@ impl InlineAssistant {
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) {
-        if !AgentSettings::get_global(cx).enabled(cx) {
+        let settings = AgentSettings::get_global(cx);
+        if !settings.enabled || DisableAiSettings::get_global(cx).disable_ai {
             return;
         }
 
@@ -1786,7 +1788,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
         _: &mut Window,
         cx: &mut App,
     ) -> Task<Result<Vec<CodeAction>>> {
-        if !AgentSettings::get_global(cx).enabled(cx) {
+        if !AgentSettings::get_global(cx).enabled {
             return Task::ready(Ok(Vec::new()));
         }
 

crates/agent_ui/src/profile_selector.rs

@@ -1,10 +1,11 @@
 use crate::{ManageProfiles, ToggleProfileSelector};
 use agent_settings::{
-    AgentProfile, AgentProfileId, AgentSettings, AvailableProfiles, builtin_profiles,
+    AgentDockPosition, AgentProfile, AgentProfileId, AgentSettings, AvailableProfiles,
+    builtin_profiles,
 };
 use fs::Fs;
 use gpui::{Action, Entity, FocusHandle, Subscription, prelude::*};
-use settings::{DockPosition, Settings as _, SettingsStore, update_settings_file};
+use settings::{Settings as _, SettingsStore, update_settings_file};
 use std::sync::Arc;
 use ui::{
     ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, PopoverMenu,
@@ -141,13 +142,10 @@ impl ProfileSelector {
             let fs = self.fs.clone();
             let provider = self.provider.clone();
             move |_window, cx| {
-                update_settings_file(fs.clone(), cx, {
+                update_settings_file::<AgentSettings>(fs.clone(), cx, {
                     let profile_id = profile_id.clone();
                     move |settings, _cx| {
-                        settings
-                            .agent
-                            .get_or_insert_default()
-                            .set_profile(profile_id.0);
+                        settings.set_profile(profile_id);
                     }
                 });
 
@@ -218,10 +216,10 @@ impl Render for ProfileSelector {
     }
 }
 
-fn documentation_side(position: DockPosition) -> DocumentationSide {
+fn documentation_side(position: AgentDockPosition) -> DocumentationSide {
     match position {
-        DockPosition::Left => DocumentationSide::Right,
-        DockPosition::Bottom => DocumentationSide::Left,
-        DockPosition::Right => DocumentationSide::Left,
+        AgentDockPosition::Left => DocumentationSide::Right,
+        AgentDockPosition::Bottom => DocumentationSide::Left,
+        AgentDockPosition::Right => DocumentationSide::Left,
     }
 }

crates/agent_ui/src/slash_command_settings.rs

@@ -0,0 +1,37 @@
+use anyhow::Result;
+use gpui::App;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+
+/// Settings for slash commands.
+#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "slash_commands")]
+pub struct SlashCommandSettings {
+    /// Settings for the `/cargo-workspace` slash command.
+    #[serde(default)]
+    pub cargo_workspace: CargoWorkspaceCommandSettings,
+}
+
+/// Settings for the `/cargo-workspace` slash command.
+#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema)]
+pub struct CargoWorkspaceCommandSettings {
+    /// Whether `/cargo-workspace` is enabled.
+    #[serde(default)]
+    pub enabled: bool,
+}
+
+impl Settings for SlashCommandSettings {
+    type FileContent = Self;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
+        SettingsSources::<Self::FileContent>::json_merge_with(
+            [sources.default]
+                .into_iter()
+                .chain(sources.user)
+                .chain(sources.server),
+        )
+    }
+
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
+}

crates/agent_ui/src/text_thread_editor.rs

@@ -3,7 +3,7 @@ use crate::{
     language_model_selector::{LanguageModelSelector, language_model_selector},
     ui::BurnModeTooltip,
 };
-use agent_settings::CompletionMode;
+use agent_settings::{AgentSettings, CompletionMode};
 use anyhow::Result;
 use assistant_slash_command::{SlashCommand, SlashCommandOutputSection, SlashCommandWorkingSet};
 use assistant_slash_commands::{DefaultSlashCommand, FileSlashCommand, selections_creases};
@@ -41,10 +41,7 @@ use project::{Project, Worktree};
 use project::{ProjectPath, lsp_store::LocalLspAdapterDelegate};
 use rope::Point;
 use serde::{Deserialize, Serialize};
-use settings::{
-    LanguageModelProviderSetting, LanguageModelSelection, Settings, SettingsStore,
-    update_settings_file,
-};
+use settings::{Settings, SettingsStore, update_settings_file};
 use std::{
     any::TypeId,
     cmp,
@@ -297,16 +294,11 @@ impl TextThreadEditor {
                 language_model_selector(
                     |cx| LanguageModelRegistry::read_global(cx).default_model(),
                     move |model, cx| {
-                        update_settings_file(fs.clone(), cx, move |settings, _| {
-                            let provider = model.provider_id().0.to_string();
-                            let model = model.id().0.to_string();
-                            settings.agent.get_or_insert_default().set_model(
-                                LanguageModelSelection {
-                                    provider: LanguageModelProviderSetting(provider),
-                                    model,
-                                },
-                            )
-                        });
+                        update_settings_file::<AgentSettings>(
+                            fs.clone(),
+                            cx,
+                            move |settings, _| settings.set_model(model.clone()),
+                        );
                     },
                     window,
                     cx,
@@ -485,7 +477,7 @@ impl TextThreadEditor {
             return;
         }
 
-        let selections = self.editor.read(cx).selections.disjoint_anchors_arc();
+        let selections = self.editor.read(cx).selections.disjoint_anchors();
         let mut commands_by_range = HashMap::default();
         let workspace = self.workspace.clone();
         self.context.update(cx, |context, cx| {
@@ -1831,7 +1823,7 @@ impl TextThreadEditor {
 
     fn split(&mut self, _: &Split, _window: &mut Window, cx: &mut Context<Self>) {
         self.context.update(cx, |context, cx| {
-            let selections = self.editor.read(cx).selections.disjoint_anchors_arc();
+            let selections = self.editor.read(cx).selections.disjoint_anchors();
             for selection in selections.as_ref() {
                 let buffer = self.editor.read(cx).buffer().read(cx).snapshot(cx);
                 let range = selection

crates/agent_ui/src/ui/end_trial_upsell.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use ai_onboarding::{AgentPanelOnboardingCard, PlanDefinitions};
 use client::zed_urls;
-use cloud_llm_client::{Plan, PlanV2};
+use cloud_llm_client::{Plan, PlanV1};
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
 use ui::{Divider, Tooltip, prelude::*};
 
@@ -112,7 +112,7 @@ impl Component for EndTrialUpsell {
         Some(
             v_flex()
                 .child(EndTrialUpsell {
-                    plan: Plan::V2(PlanV2::ZedFree),
+                    plan: Plan::V1(PlanV1::ZedFree),
                     dismiss_upsell: Arc::new(|_, _| {}),
                 })
                 .into_any_element(),

crates/ai_onboarding/src/ai_onboarding.rs

@@ -120,7 +120,7 @@ impl ZedAiOnboarding {
                 .max_w_full()
                 .gap_1()
                 .child(Headline::new("Welcome to Zed AI"))
-                .child(YoungAccountBanner::new(is_v2))
+                .child(YoungAccountBanner)
                 .child(
                     v_flex()
                         .mt_2()
@@ -372,7 +372,7 @@ impl Component for ZedAiOnboarding {
                         "Free Plan",
                         onboarding(
                             SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedFree)),
+                            Some(Plan::V1(PlanV1::ZedFree)),
                             false,
                         ),
                     ),
@@ -380,7 +380,7 @@ impl Component for ZedAiOnboarding {
                         "Pro Trial",
                         onboarding(
                             SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedProTrial)),
+                            Some(Plan::V1(PlanV1::ZedProTrial)),
                             false,
                         ),
                     ),
@@ -388,7 +388,7 @@ impl Component for ZedAiOnboarding {
                         "Pro Plan",
                         onboarding(
                             SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedPro)),
+                            Some(Plan::V1(PlanV1::ZedPro)),
                             false,
                         ),
                     ),

crates/ai_onboarding/src/ai_upsell_card.rs

@@ -175,7 +175,7 @@ impl RenderOnce for AiUpsellCard {
                     .child(Label::new("Try Zed AI").size(LabelSize::Large))
                     .map(|this| {
                         if self.account_too_young {
-                            this.child(YoungAccountBanner::new(is_v2_plan)).child(
+                            this.child(YoungAccountBanner).child(
                                 v_flex()
                                     .mt_2()
                                     .gap_1()
@@ -215,7 +215,7 @@ impl RenderOnce for AiUpsellCard {
                             .child(
                                 footer_container
                                     .child(
-                                        Button::new("start_trial", "Start Pro Trial")
+                                        Button::new("start_trial", "Start 14-day Free Pro Trial")
                                             .full_width()
                                             .style(ButtonStyle::Tinted(ui::TintColor::Accent))
                                             .when_some(self.tab_index, |this, tab_index| {
@@ -230,7 +230,7 @@ impl RenderOnce for AiUpsellCard {
                                             }),
                                     )
                                     .child(
-                                        Label::new("14 days, no credit card required")
+                                        Label::new("No credit card required")
                                             .size(LabelSize::Small)
                                             .color(Color::Muted),
                                     ),
@@ -327,7 +327,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: false,
-                                user_plan: Some(Plan::V2(PlanV2::ZedFree)),
+                                user_plan: Some(Plan::V1(PlanV1::ZedFree)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),
@@ -338,7 +338,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: true,
-                                user_plan: Some(Plan::V2(PlanV2::ZedFree)),
+                                user_plan: Some(Plan::V1(PlanV1::ZedFree)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),
@@ -349,7 +349,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: false,
-                                user_plan: Some(Plan::V2(PlanV2::ZedProTrial)),
+                                user_plan: Some(Plan::V1(PlanV1::ZedProTrial)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),
@@ -360,7 +360,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: false,
-                                user_plan: Some(Plan::V2(PlanV2::ZedPro)),
+                                user_plan: Some(Plan::V1(PlanV1::ZedPro)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),

crates/ai_onboarding/src/plan_definitions.rs

@@ -7,62 +7,33 @@ pub struct PlanDefinitions;
 impl PlanDefinitions {
     pub const AI_DESCRIPTION: &'static str = "Zed offers a complete agentic experience, with robust editing and reviewing features to collaborate with AI.";
 
-    pub fn free_plan(&self, is_v2: bool) -> impl IntoElement {
-        if is_v2 {
-            List::new()
-                .child(ListBulletItem::new("2,000 accepted edit predictions"))
-                .child(ListBulletItem::new(
-                    "Unlimited prompts with your AI API keys",
-                ))
-                .child(ListBulletItem::new(
-                    "Unlimited use of external agents like Claude Code",
-                ))
-        } else {
-            List::new()
-                .child(ListBulletItem::new("50 prompts with Claude models"))
-                .child(ListBulletItem::new("2,000 accepted edit predictions"))
-        }
+    pub fn free_plan(&self, _is_v2: bool) -> impl IntoElement {
+        List::new()
+            .child(ListBulletItem::new("50 prompts with Claude models"))
+            .child(ListBulletItem::new("2,000 accepted edit predictions"))
     }
 
-    pub fn pro_trial(&self, is_v2: bool, period: bool) -> impl IntoElement {
-        if is_v2 {
-            List::new()
-                .child(ListBulletItem::new("Unlimited edit predictions"))
-                .child(ListBulletItem::new("$20 of tokens"))
-                .when(period, |this| {
-                    this.child(ListBulletItem::new(
-                        "Try it out for 14 days, no credit card required",
-                    ))
-                })
-        } else {
-            List::new()
-                .child(ListBulletItem::new("150 prompts with Claude models"))
-                .child(ListBulletItem::new(
-                    "Unlimited edit predictions with Zeta, our open-source model",
+    pub fn pro_trial(&self, _is_v2: bool, period: bool) -> impl IntoElement {
+        List::new()
+            .child(ListBulletItem::new("150 prompts with Claude models"))
+            .child(ListBulletItem::new(
+                "Unlimited edit predictions with Zeta, our open-source model",
+            ))
+            .when(period, |this| {
+                this.child(ListBulletItem::new(
+                    "Try it out for 14 days for free, no credit card required",
                 ))
-                .when(period, |this| {
-                    this.child(ListBulletItem::new(
-                        "Try it out for 14 days, no credit card required",
-                    ))
-                })
-        }
+            })
     }
 
-    pub fn pro_plan(&self, is_v2: bool, price: bool) -> impl IntoElement {
-        if is_v2 {
-            List::new()
-                .child(ListBulletItem::new("Unlimited edit predictions"))
-                .child(ListBulletItem::new("$5 of tokens"))
-                .child(ListBulletItem::new("Usage-based billing beyond $5"))
-        } else {
-            List::new()
-                .child(ListBulletItem::new("500 prompts with Claude models"))
-                .child(ListBulletItem::new(
-                    "Unlimited edit predictions with Zeta, our open-source model",
-                ))
-                .when(price, |this| {
-                    this.child(ListBulletItem::new("$20 USD per month"))
-                })
-        }
+    pub fn pro_plan(&self, _is_v2: bool, price: bool) -> impl IntoElement {
+        List::new()
+            .child(ListBulletItem::new("500 prompts with Claude models"))
+            .child(ListBulletItem::new(
+                "Unlimited edit predictions with Zeta, our open-source model",
+            ))
+            .when(price, |this| {
+                this.child(ListBulletItem::new("$20 USD per month"))
+            })
     }
 }

crates/ai_onboarding/src/young_account_banner.rs

@@ -2,30 +2,17 @@ use gpui::{IntoElement, ParentElement};
 use ui::{Banner, prelude::*};
 
 #[derive(IntoElement)]
-pub struct YoungAccountBanner {
-    is_v2: bool,
-}
-
-impl YoungAccountBanner {
-    pub fn new(is_v2: bool) -> Self {
-        Self { is_v2 }
-    }
-}
+pub struct YoungAccountBanner;
 
 impl RenderOnce for YoungAccountBanner {
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        const YOUNG_ACCOUNT_DISCLAIMER: &str = "To prevent abuse of our service, GitHub accounts created fewer than 30 days ago are not eligible for free plan usage or Pro plan free trial. You can request an exception by reaching out to billing-support@zed.dev";
-        const YOUNG_ACCOUNT_DISCLAIMER_V2: &str = "To prevent abuse of our service, GitHub accounts created fewer than 30 days ago are not eligible for the Pro trial. You can request an exception by reaching out to billing-support@zed.dev";
+        const YOUNG_ACCOUNT_DISCLAIMER: &str = "To prevent abuse of our service, GitHub accounts created fewer than 30 days ago are not eligible for free plan usage or Pro plan free trial. To request an exception, reach out to billing-support@zed.dev.";
 
         let label = div()
             .w_full()
             .text_sm()
             .text_color(cx.theme().colors().text_muted)
-            .child(if self.is_v2 {
-                YOUNG_ACCOUNT_DISCLAIMER_V2
-            } else {
-                YOUNG_ACCOUNT_DISCLAIMER
-            });
+            .child(YOUNG_ACCOUNT_DISCLAIMER);
 
         div()
             .max_w_full()

crates/anthropic/Cargo.toml

@@ -23,7 +23,6 @@ http_client.workspace = true
 schemars = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
-settings.workspace = true
 strum.workspace = true
 thiserror.workspace = true
 workspace-hack.workspace = true

crates/anthropic/src/anthropic.rs

@@ -8,7 +8,6 @@ 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};
 use strum::{EnumIter, EnumString};
 use thiserror::Error;
 
@@ -32,24 +31,6 @@ pub enum AnthropicModelMode {
     },
 }
 
-impl From<ModelMode> for AnthropicModelMode {
-    fn from(value: ModelMode) -> Self {
-        match value {
-            ModelMode::Default => AnthropicModelMode::Default,
-            ModelMode::Thinking { budget_tokens } => AnthropicModelMode::Thinking { budget_tokens },
-        }
-    }
-}
-
-impl From<AnthropicModelMode> for ModelMode {
-    fn from(value: AnthropicModelMode) -> Self {
-        match value {
-            AnthropicModelMode::Default => ModelMode::Default,
-            AnthropicModelMode::Thinking { budget_tokens } => ModelMode::Thinking { budget_tokens },
-        }
-    }
-}
-
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum Model {
@@ -67,6 +48,7 @@ pub enum Model {
         alias = "claude-opus-4-1-thinking-latest"
     )]
     ClaudeOpus4_1Thinking,
+    #[default]
     #[serde(rename = "claude-sonnet-4", alias = "claude-sonnet-4-latest")]
     ClaudeSonnet4,
     #[serde(
@@ -74,14 +56,6 @@ pub enum Model {
         alias = "claude-sonnet-4-thinking-latest"
     )]
     ClaudeSonnet4Thinking,
-    #[default]
-    #[serde(rename = "claude-sonnet-4-5", alias = "claude-sonnet-4-5-latest")]
-    ClaudeSonnet4_5,
-    #[serde(
-        rename = "claude-sonnet-4-5-thinking",
-        alias = "claude-sonnet-4-5-thinking-latest"
-    )]
-    ClaudeSonnet4_5Thinking,
     #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
     Claude3_7Sonnet,
     #[serde(
@@ -140,14 +114,6 @@ impl Model {
             return Ok(Self::ClaudeOpus4);
         }
 
-        if id.starts_with("claude-sonnet-4-5-thinking") {
-            return Ok(Self::ClaudeSonnet4_5Thinking);
-        }
-
-        if id.starts_with("claude-sonnet-4-5") {
-            return Ok(Self::ClaudeSonnet4_5);
-        }
-
         if id.starts_with("claude-sonnet-4-thinking") {
             return Ok(Self::ClaudeSonnet4Thinking);
         }
@@ -195,8 +161,6 @@ impl Model {
             Self::ClaudeOpus4_1Thinking => "claude-opus-4-1-thinking-latest",
             Self::ClaudeSonnet4 => "claude-sonnet-4-latest",
             Self::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking-latest",
-            Self::ClaudeSonnet4_5 => "claude-sonnet-4-5-latest",
-            Self::ClaudeSonnet4_5Thinking => "claude-sonnet-4-5-thinking-latest",
             Self::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
             Self::Claude3_7Sonnet => "claude-3-7-sonnet-latest",
             Self::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking-latest",
@@ -214,7 +178,6 @@ impl Model {
             Self::ClaudeOpus4 | Self::ClaudeOpus4Thinking => "claude-opus-4-20250514",
             Self::ClaudeOpus4_1 | Self::ClaudeOpus4_1Thinking => "claude-opus-4-1-20250805",
             Self::ClaudeSonnet4 | Self::ClaudeSonnet4Thinking => "claude-sonnet-4-20250514",
-            Self::ClaudeSonnet4_5 | Self::ClaudeSonnet4_5Thinking => "claude-sonnet-4-5-20250929",
             Self::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
             Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => "claude-3-7-sonnet-latest",
             Self::Claude3_5Haiku => "claude-3-5-haiku-latest",
@@ -233,8 +196,6 @@ impl Model {
             Self::ClaudeOpus4_1Thinking => "Claude Opus 4.1 Thinking",
             Self::ClaudeSonnet4 => "Claude Sonnet 4",
             Self::ClaudeSonnet4Thinking => "Claude Sonnet 4 Thinking",
-            Self::ClaudeSonnet4_5 => "Claude Sonnet 4.5",
-            Self::ClaudeSonnet4_5Thinking => "Claude Sonnet 4.5 Thinking",
             Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
             Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
             Self::Claude3_7SonnetThinking => "Claude 3.7 Sonnet Thinking",
@@ -256,8 +217,6 @@ impl Model {
             | Self::ClaudeOpus4_1Thinking
             | Self::ClaudeSonnet4
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
             | Self::Claude3_5Sonnet
             | Self::Claude3_5Haiku
             | Self::Claude3_7Sonnet
@@ -283,8 +242,6 @@ impl Model {
             | Self::ClaudeOpus4_1Thinking
             | Self::ClaudeSonnet4
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
             | Self::Claude3_5Sonnet
             | Self::Claude3_5Haiku
             | Self::Claude3_7Sonnet
@@ -304,8 +261,6 @@ impl Model {
             | Self::ClaudeOpus4_1Thinking
             | Self::ClaudeSonnet4
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
             | Self::Claude3_5Sonnet
             | Self::Claude3_7Sonnet
             | Self::Claude3_7SonnetThinking
@@ -325,8 +280,6 @@ impl Model {
             | Self::ClaudeOpus4_1Thinking
             | Self::ClaudeSonnet4
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
             | Self::Claude3_5Sonnet
             | Self::Claude3_7Sonnet
             | Self::Claude3_7SonnetThinking
@@ -346,7 +299,6 @@ impl Model {
             Self::ClaudeOpus4
             | Self::ClaudeOpus4_1
             | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
             | Self::Claude3_5Sonnet
             | Self::Claude3_7Sonnet
             | Self::Claude3_5Haiku
@@ -356,7 +308,6 @@ impl Model {
             Self::ClaudeOpus4Thinking
             | Self::ClaudeOpus4_1Thinking
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5Thinking
             | Self::Claude3_7SonnetThinking => AnthropicModelMode::Thinking {
                 budget_tokens: Some(4_096),
             },

crates/askpass/Cargo.toml

@@ -16,12 +16,8 @@ anyhow.workspace = true
 futures.workspace = true
 gpui.workspace = true
 net.workspace = true
-proto.workspace = true
+parking_lot.workspace = true
 smol.workspace = true
 tempfile.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
-zeroize.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true

crates/askpass/src/askpass.rs

@@ -1,9 +1,3 @@
-mod encrypted_password;
-
-pub use encrypted_password::{EncryptedPassword, ProcessExt};
-
-#[cfg(target_os = "windows")]
-use std::sync::OnceLock;
 use std::{ffi::OsStr, time::Duration};
 
 use anyhow::{Context as _, Result};
@@ -16,8 +10,6 @@ use gpui::{AsyncApp, BackgroundExecutor, Task};
 use smol::fs;
 use util::ResultExt as _;
 
-use crate::encrypted_password::decrypt;
-
 #[derive(PartialEq, Eq)]
 pub enum AskPassResult {
     CancelledByUser,
@@ -25,19 +17,16 @@ pub enum AskPassResult {
 }
 
 pub struct AskPassDelegate {
-    tx: mpsc::UnboundedSender<(String, oneshot::Sender<EncryptedPassword>)>,
+    tx: mpsc::UnboundedSender<(String, oneshot::Sender<String>)>,
     _task: Task<()>,
 }
 
 impl AskPassDelegate {
     pub fn new(
         cx: &mut AsyncApp,
-        password_prompt: impl Fn(String, oneshot::Sender<EncryptedPassword>, &mut AsyncApp)
-        + Send
-        + Sync
-        + 'static,
+        password_prompt: impl Fn(String, oneshot::Sender<String>, &mut AsyncApp) + Send + Sync + 'static,
     ) -> Self {
-        let (tx, mut rx) = mpsc::unbounded::<(String, oneshot::Sender<_>)>();
+        let (tx, mut rx) = mpsc::unbounded::<(String, oneshot::Sender<String>)>();
         let task = cx.spawn(async move |cx: &mut AsyncApp| {
             while let Some((prompt, channel)) = rx.next().await {
                 password_prompt(prompt, channel, cx);
@@ -46,7 +35,7 @@ impl AskPassDelegate {
         Self { tx, _task: task }
     }
 
-    pub async fn ask_password(&mut self, prompt: String) -> Result<EncryptedPassword> {
+    pub async fn ask_password(&mut self, prompt: String) -> Result<String> {
         let (tx, rx) = oneshot::channel();
         self.tx.send((prompt, tx)).await?;
         Ok(rx.await?)
@@ -59,7 +48,7 @@ pub struct AskPassSession {
     #[cfg(target_os = "windows")]
     askpass_helper: String,
     #[cfg(target_os = "windows")]
-    secret: std::sync::Arc<OnceLock<EncryptedPassword>>,
+    secret: std::sync::Arc<parking_lot::Mutex<String>>,
     _askpass_task: Task<()>,
     askpass_opened_rx: Option<oneshot::Receiver<()>>,
     askpass_kill_master_rx: Option<oneshot::Receiver<()>>,
@@ -79,7 +68,7 @@ impl AskPassSession {
         use util::fs::make_file_executable;
 
         #[cfg(target_os = "windows")]
-        let secret = std::sync::Arc::new(OnceLock::new());
+        let secret = std::sync::Arc::new(parking_lot::Mutex::new(String::new()));
         let temp_dir = tempfile::Builder::new().prefix("zed-askpass").tempdir()?;
         let askpass_socket = temp_dir.path().join("askpass.sock");
         let askpass_script_path = temp_dir.path().join(ASKPASS_SCRIPT_NAME);
@@ -115,12 +104,10 @@ impl AskPassSession {
                     .context("getting askpass password")
                     .log_err()
                 {
+                    stream.write_all(password.as_bytes()).await.log_err();
                     #[cfg(target_os = "windows")]
                     {
-                        askpass_secret.get_or_init(|| password.clone());
-                    }
-                    if let Ok(decrypted) = decrypt(password) {
-                        stream.write_all(decrypted.as_bytes()).await.log_err();
+                        *askpass_secret.lock() = password;
                     }
                 } else {
                     if let Some(kill_tx) = kill_tx.take() {
@@ -201,8 +188,8 @@ impl AskPassSession {
 
     /// This will return the password that was last set by the askpass script.
     #[cfg(target_os = "windows")]
-    pub fn get_password(&self) -> Option<EncryptedPassword> {
-        self.secret.get().cloned()
+    pub fn get_password(&self) -> String {
+        self.secret.lock().clone()
     }
 }
 

crates/askpass/src/encrypted_password.rs

@@ -1,111 +0,0 @@
-//! This module provides [EncryptedPassword] for storage of passwords in memory.
-//! On Windows that's implemented with CryptProtectMemory/CryptUnprotectMemory; on other platforms it just falls through
-//! to string for now.
-//!
-//! The "safety" of this module lies in exploiting visibility rules of Rust:
-//! 1. No outside module has access to the internal representation of [EncryptedPassword].
-//! 2. [EncryptedPassword] cannot be converted into a [String] or any other plaintext representation.
-//! All use cases that do need such functionality (of which we have two right now) are implemented within this module.
-//!
-//! Note that this is not bulletproof.
-//! 1. [ProcessExt] is implemented for [smol::process::Command], which is a builder for smol processes.
-//! Before the process itself is spawned the contents of [EncryptedPassword] are unencrypted in env var storage of said builder.
-//! 2. We're also sending plaintext passwords over RPC with [proto::AskPassResponse]. Go figure how great that is.
-//!
-//! Still, the goal of this module is to not have passwords laying around nilly-willy in memory.
-//! We do not claim that it is fool-proof.
-use anyhow::Result;
-use zeroize::Zeroize;
-
-type LengthWithoutPadding = u32;
-#[derive(Clone)]
-pub struct EncryptedPassword(Vec<u8>, LengthWithoutPadding);
-
-pub trait ProcessExt {
-    fn encrypted_env(&mut self, name: &str, value: EncryptedPassword) -> &mut Self;
-}
-
-impl ProcessExt for smol::process::Command {
-    fn encrypted_env(&mut self, name: &str, value: EncryptedPassword) -> &mut Self {
-        if let Ok(password) = decrypt(value) {
-            self.env(name, password);
-        }
-        self
-    }
-}
-
-impl TryFrom<EncryptedPassword> for proto::AskPassResponse {
-    type Error = anyhow::Error;
-    fn try_from(pw: EncryptedPassword) -> Result<Self, Self::Error> {
-        let pw = decrypt(pw)?;
-        Ok(Self { response: pw })
-    }
-}
-
-impl Drop for EncryptedPassword {
-    fn drop(&mut self) {
-        self.0.zeroize();
-        self.1.zeroize();
-    }
-}
-
-impl TryFrom<&str> for EncryptedPassword {
-    type Error = anyhow::Error;
-    fn try_from(password: &str) -> Result<EncryptedPassword> {
-        let len: u32 = password.len().try_into()?;
-        #[cfg(windows)]
-        {
-            use windows::Win32::Security::Cryptography::{
-                CRYPTPROTECTMEMORY_BLOCK_SIZE, CRYPTPROTECTMEMORY_SAME_PROCESS, CryptProtectMemory,
-            };
-            let mut value = password.bytes().collect::<Vec<_>>();
-            let padded_length = len.next_multiple_of(CRYPTPROTECTMEMORY_BLOCK_SIZE);
-            if padded_length != len {
-                value.resize(padded_length as usize, 0);
-            }
-            unsafe {
-                CryptProtectMemory(
-                    value.as_mut_ptr() as _,
-                    len,
-                    CRYPTPROTECTMEMORY_SAME_PROCESS,
-                )?;
-            }
-            Ok(Self(value, len))
-        }
-        #[cfg(not(windows))]
-        Ok(Self(String::from(password).into(), len))
-    }
-}
-
-pub(crate) fn decrypt(mut password: EncryptedPassword) -> Result<String> {
-    #[cfg(windows)]
-    {
-        use anyhow::Context;
-        use windows::Win32::Security::Cryptography::{
-            CRYPTPROTECTMEMORY_BLOCK_SIZE, CRYPTPROTECTMEMORY_SAME_PROCESS, CryptUnprotectMemory,
-        };
-        assert_eq!(
-            password.0.len() % CRYPTPROTECTMEMORY_BLOCK_SIZE as usize,
-            0,
-            "Violated pre-condition (buffer size <{}> must be a multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE <{}>) for CryptUnprotectMemory.",
-            password.0.len(),
-            CRYPTPROTECTMEMORY_BLOCK_SIZE
-        );
-        unsafe {
-            CryptUnprotectMemory(
-                password.0.as_mut_ptr() as _,
-                password.1,
-                CRYPTPROTECTMEMORY_SAME_PROCESS,
-            )
-            .context("while decrypting a SSH password")?
-        };
-
-        {
-            // Remove padding
-            _ = password.0.drain(password.1 as usize..);
-        }
-        Ok(String::from_utf8(std::mem::take(&mut password.0))?)
-    }
-    #[cfg(not(windows))]
-    Ok(String::from_utf8(std::mem::take(&mut password.0))?)
-}

crates/assistant_context/src/assistant_context.rs

@@ -2445,7 +2445,7 @@ impl AssistantContext {
                 .message_anchors
                 .get(next_message_ix)
                 .map_or(buffer.len(), |message| {
-                    buffer.clip_offset(message.start.to_previous_offset(buffer), Bias::Left)
+                    buffer.clip_offset(message.start.to_offset(buffer) - 1, Bias::Left)
                 });
             Some(self.insert_message_at_offset(offset, role, status, cx))
         } else {

crates/assistant_slash_commands/Cargo.toml

@@ -14,6 +14,7 @@ path = "src/assistant_slash_commands.rs"
 [dependencies]
 anyhow.workspace = true
 assistant_slash_command.workspace = true
+cargo_toml.workspace = true
 chrono.workspace = true
 collections.workspace = true
 context_server.workspace = true
@@ -34,6 +35,7 @@ serde.workspace = true
 serde_json.workspace = true
 smol.workspace = true
 text.workspace = true
+toml.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true

crates/assistant_slash_commands/src/assistant_slash_commands.rs

@@ -1,3 +1,4 @@
+mod cargo_workspace_command;
 mod context_server_command;
 mod default_command;
 mod delta_command;
@@ -11,6 +12,7 @@ mod streaming_example_command;
 mod symbols_command;
 mod tab_command;
 
+pub use crate::cargo_workspace_command::*;
 pub use crate::context_server_command::*;
 pub use crate::default_command::*;
 pub use crate::delta_command::*;

crates/assistant_slash_commands/src/cargo_workspace_command.rs

@@ -0,0 +1,158 @@
+use anyhow::{Context as _, Result, anyhow};
+use assistant_slash_command::{
+    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
+    SlashCommandResult,
+};
+use fs::Fs;
+use gpui::{App, Entity, Task, WeakEntity};
+use language::{BufferSnapshot, LspAdapterDelegate};
+use project::{Project, ProjectPath};
+use std::{
+    fmt::Write,
+    path::Path,
+    sync::{Arc, atomic::AtomicBool},
+};
+use ui::prelude::*;
+use workspace::Workspace;
+
+pub struct CargoWorkspaceSlashCommand;
+
+impl CargoWorkspaceSlashCommand {
+    async fn build_message(fs: Arc<dyn Fs>, path_to_cargo_toml: &Path) -> Result<String> {
+        let buffer = fs.load(path_to_cargo_toml).await?;
+        let cargo_toml: cargo_toml::Manifest = toml::from_str(&buffer)?;
+
+        let mut message = String::new();
+        writeln!(message, "You are in a Rust project.")?;
+
+        if let Some(workspace) = cargo_toml.workspace {
+            writeln!(
+                message,
+                "The project is a Cargo workspace with the following members:"
+            )?;
+            for member in workspace.members {
+                writeln!(message, "- {member}")?;
+            }
+
+            if !workspace.default_members.is_empty() {
+                writeln!(message, "The default members are:")?;
+                for member in workspace.default_members {
+                    writeln!(message, "- {member}")?;
+                }
+            }
+
+            if !workspace.dependencies.is_empty() {
+                writeln!(
+                    message,
+                    "The following workspace dependencies are installed:"
+                )?;
+                for dependency in workspace.dependencies.keys() {
+                    writeln!(message, "- {dependency}")?;
+                }
+            }
+        } else if let Some(package) = cargo_toml.package {
+            writeln!(
+                message,
+                "The project name is \"{name}\".",
+                name = package.name
+            )?;
+
+            let description = package
+                .description
+                .as_ref()
+                .and_then(|description| description.get().ok().cloned());
+            if let Some(description) = description.as_ref() {
+                writeln!(message, "It describes itself as \"{description}\".")?;
+            }
+
+            if !cargo_toml.dependencies.is_empty() {
+                writeln!(message, "The following dependencies are installed:")?;
+                for dependency in cargo_toml.dependencies.keys() {
+                    writeln!(message, "- {dependency}")?;
+                }
+            }
+        }
+
+        Ok(message)
+    }
+
+    fn path_to_cargo_toml(project: Entity<Project>, cx: &mut App) -> Option<Arc<Path>> {
+        let worktree = project.read(cx).worktrees(cx).next()?;
+        let worktree = worktree.read(cx);
+        let entry = worktree.entry_for_path("Cargo.toml")?;
+        let path = ProjectPath {
+            worktree_id: worktree.id(),
+            path: entry.path.clone(),
+        };
+        Some(Arc::from(
+            project.read(cx).absolute_path(&path, cx)?.as_path(),
+        ))
+    }
+}
+
+impl SlashCommand for CargoWorkspaceSlashCommand {
+    fn name(&self) -> String {
+        "cargo-workspace".into()
+    }
+
+    fn description(&self) -> String {
+        "insert project workspace metadata".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Insert Project Workspace Metadata".into()
+    }
+
+    fn complete_argument(
+        self: Arc<Self>,
+        _arguments: &[String],
+        _cancel: Arc<AtomicBool>,
+        _workspace: Option<WeakEntity<Workspace>>,
+        _window: &mut Window,
+        _cx: &mut App,
+    ) -> Task<Result<Vec<ArgumentCompletion>>> {
+        Task::ready(Err(anyhow!("this command does not require argument")))
+    }
+
+    fn requires_argument(&self) -> bool {
+        false
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _arguments: &[String],
+        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
+        _context_buffer: BufferSnapshot,
+        workspace: WeakEntity<Workspace>,
+        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
+        _window: &mut Window,
+        cx: &mut App,
+    ) -> Task<SlashCommandResult> {
+        let output = workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().clone();
+            let fs = workspace.project().read(cx).fs().clone();
+            let path = Self::path_to_cargo_toml(project, cx);
+            let output = cx.background_spawn(async move {
+                let path = path.with_context(|| "Cargo.toml not found")?;
+                Self::build_message(fs, &path).await
+            });
+
+            cx.foreground_executor().spawn(async move {
+                let text = output.await?;
+                let range = 0..text.len();
+                Ok(SlashCommandOutput {
+                    text,
+                    sections: vec![SlashCommandOutputSection {
+                        range,
+                        icon: IconName::FileTree,
+                        label: "Project".into(),
+                        metadata: None,
+                    }],
+                    run_commands_in_text: false,
+                }
+                .into_event_stream())
+            })
+        });
+        output.unwrap_or_else(|error| Task::ready(Err(error)))
+    }
+}

crates/assistant_slash_commands/src/diagnostics_command.rs

@@ -73,7 +73,7 @@ impl DiagnosticsSlashCommand {
                 fuzzy::match_path_sets(
                     candidate_sets.as_slice(),
                     query.as_str(),
-                    &None,
+                    None,
                     false,
                     100,
                     &cancellation_flag,

crates/assistant_slash_commands/src/file_command.rs

@@ -104,7 +104,7 @@ impl FileSlashCommand {
                 fuzzy::match_path_sets(
                     candidate_sets.as_slice(),
                     query.as_str(),
-                    &None,
+                    None,
                     false,
                     100,
                     &cancellation_flag,

crates/assistant_tools/src/edit_file_tool.rs

@@ -1445,8 +1445,8 @@ mod tests {
 
     fn init_test_with_config(cx: &mut TestAppContext, data_dir: &Path) {
         cx.update(|cx| {
-            paths::set_custom_data_dir(data_dir.to_str().unwrap());
             // Set custom data directory (config will be under data_dir/config)
+            paths::set_custom_data_dir(data_dir.to_str().unwrap());
 
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
@@ -1537,11 +1537,14 @@ mod tests {
         // First, test with format_on_save enabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.format_on_save = Some(FormatOnSave::On);
-                    settings.project.all_languages.defaults.formatter =
-                        Some(language::language_settings::SelectedFormatter::Auto);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.format_on_save = Some(FormatOnSave::On);
+                        settings.defaults.formatter =
+                            Some(language::language_settings::SelectedFormatter::Auto);
+                    },
+                );
             });
         });
 
@@ -1600,10 +1603,12 @@ mod tests {
         // Next, test with format_on_save disabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.format_on_save =
-                        Some(FormatOnSave::Off);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.format_on_save = Some(FormatOnSave::Off);
+                    },
+                );
             });
         });
 
@@ -1674,13 +1679,12 @@ mod tests {
         // First, test with remove_trailing_whitespace_on_save enabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .remove_trailing_whitespace_on_save = Some(true);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.remove_trailing_whitespace_on_save = Some(true);
+                    },
+                );
             });
         });
 
@@ -1737,13 +1741,12 @@ mod tests {
         // Next, test with remove_trailing_whitespace_on_save disabled
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .remove_trailing_whitespace_on_save = Some(false);
-                });
+                store.update_user_settings::<language::language_settings::AllLanguageSettings>(
+                    cx,
+                    |settings| {
+                        settings.defaults.remove_trailing_whitespace_on_save = Some(false);
+                    },
+                );
             });
         });
 

crates/assistant_tools/src/grep_tool.rs

@@ -314,7 +314,7 @@ mod tests {
     use gpui::{AppContext, TestAppContext, UpdateGlobal};
     use language::{Language, LanguageConfig, LanguageMatcher};
     use language_model::fake_provider::FakeLanguageModel;
-    use project::{FakeFs, Project};
+    use project::{FakeFs, Project, WorktreeSettings};
     use serde_json::json;
     use settings::SettingsStore;
     use unindent::Unindent;
@@ -849,21 +849,19 @@ mod tests {
 
         cx.update(|cx| {
             use gpui::UpdateGlobal;
+            use project::WorktreeSettings;
             use settings::SettingsStore;
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions = Some(vec![
                         "**/.secretdir".to_string(),
                         "**/.mymetadata".to_string(),
                     ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
+                    settings.private_files = Some(vec![
+                        "**/.mysecrets".to_string(),
+                        "**/*.privatekey".to_string(),
+                        "**/*.mysensitive".to_string(),
+                    ]);
                 });
             });
         });
@@ -1160,11 +1158,10 @@ mod tests {
         // Set global settings
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions =
                         Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
+                    settings.private_files = Some(vec!["**/.env".to_string()]);
                 });
             });
         });

crates/assistant_tools/src/list_directory_tool.rs

@@ -230,7 +230,7 @@ mod tests {
     use gpui::{AppContext, TestAppContext, UpdateGlobal};
     use indoc::indoc;
     use language_model::fake_provider::FakeLanguageModel;
-    use project::{FakeFs, Project};
+    use project::{FakeFs, Project, WorktreeSettings};
     use serde_json::json;
     use settings::SettingsStore;
     use util::path;
@@ -507,20 +507,17 @@ mod tests {
         // Configure settings explicitly
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions = Some(vec![
                         "**/.secretdir".to_string(),
                         "**/.mymetadata".to_string(),
                         "**/.hidden_subdir".to_string(),
                     ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
+                    settings.private_files = Some(vec![
+                        "**/.mysecrets".to_string(),
+                        "**/*.privatekey".to_string(),
+                        "**/*.mysensitive".to_string(),
+                    ]);
                 });
             });
         });
@@ -701,11 +698,10 @@ mod tests {
         // Set global settings
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions =
                         Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
+                    settings.private_files = Some(vec!["**/.env".to_string()]);
                 });
             });
         });

crates/assistant_tools/src/read_file_tool.rs

@@ -299,7 +299,7 @@ mod test {
     use gpui::{AppContext, TestAppContext, UpdateGlobal};
     use language::{Language, LanguageConfig, LanguageMatcher};
     use language_model::fake_provider::FakeLanguageModel;
-    use project::{FakeFs, Project};
+    use project::{FakeFs, Project, WorktreeSettings};
     use serde_json::json;
     use settings::SettingsStore;
     use util::path;
@@ -677,21 +677,19 @@ mod test {
 
         cx.update(|cx| {
             use gpui::UpdateGlobal;
+            use project::WorktreeSettings;
             use settings::SettingsStore;
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions = Some(vec![
                         "**/.secretdir".to_string(),
                         "**/.mymetadata".to_string(),
                     ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
+                    settings.private_files = Some(vec![
+                        "**/.mysecrets".to_string(),
+                        "**/*.privatekey".to_string(),
+                        "**/*.mysensitive".to_string(),
+                    ]);
                 });
             });
         });
@@ -970,11 +968,10 @@ mod test {
         // Set global settings
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
+                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
+                    settings.file_scan_exclusions =
                         Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
+                    settings.private_files = Some(vec!["**/.env".to_string()]);
                 });
             });
         });

crates/assistant_tools/src/terminal_tool.rs

@@ -139,25 +139,18 @@ impl Tool for TerminalTool {
             env
         });
 
-        let build_cmd = {
-            let input_command = input.command.clone();
-            move || {
-                ShellBuilder::new(
-                    remote_shell.as_deref(),
-                    &Shell::Program(get_default_system_shell()),
-                )
-                .redirect_stdin_to_dev_null()
-                .build(Some(input_command.clone()), &[])
-            }
-        };
-
         let Some(window) = window else {
             // Headless setup, a test or eval. Our terminal subsystem requires a workspace,
             // so bypass it and provide a convincing imitation using a pty.
             let task = cx.background_spawn(async move {
                 let env = env.await;
                 let pty_system = native_pty_system();
-                let (command, args) = build_cmd();
+                let (command, args) = ShellBuilder::new(
+                    remote_shell.as_deref(),
+                    &Shell::Program(get_default_system_shell()),
+                )
+                .redirect_stdin_to_dev_null()
+                .build(Some(input.command.clone()), &[]);
                 let mut cmd = CommandBuilder::new(command);
                 cmd.args(args);
                 for (k, v) in env {
@@ -194,10 +187,16 @@ impl Tool for TerminalTool {
             };
         };
 
+        let command = input.command.clone();
         let terminal = cx.spawn({
             let project = project.downgrade();
             async move |cx| {
-                let (command, args) = build_cmd();
+                let (command, args) = ShellBuilder::new(
+                    remote_shell.as_deref(),
+                    &Shell::Program(get_default_system_shell()),
+                )
+                .redirect_stdin_to_dev_null()
+                .build(Some(input.command), &[]);
                 let env = env.await;
                 project
                     .update(cx, |project, cx| {
@@ -216,18 +215,18 @@ impl Tool for TerminalTool {
             }
         });
 
-        let command_markdown = cx.new(|cx| {
-            Markdown::new(
-                format!("```bash\n{}\n```", input.command).into(),
-                None,
-                None,
+        let command_markdown =
+            cx.new(|cx| Markdown::new(format!("```bash\n{}\n```", command).into(), None, None, cx));
+
+        let card = cx.new(|cx| {
+            TerminalToolCard::new(
+                command_markdown.clone(),
+                working_dir.clone(),
+                cx.entity_id(),
                 cx,
             )
         });
 
-        let card =
-            cx.new(|cx| TerminalToolCard::new(command_markdown, working_dir, cx.entity_id(), cx));
-
         let output = cx.spawn({
             let card = card.clone();
             async move |cx| {
@@ -268,7 +267,7 @@ impl Tool for TerminalTool {
                 let previous_len = content.len();
                 let (processed_content, finished_with_empty_output) = process_content(
                     &content,
-                    &input.command,
+                    &command,
                     exit_status.map(portable_pty::ExitStatus::from),
                 );
 

crates/audio/Cargo.toml

@@ -21,6 +21,8 @@ gpui.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 rodio = { workspace = true, features = [ "wav", "playback", "wav_output" ] }
+rtrb = "0.3.2"
+schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 smol.workspace = true

crates/audio/src/audio.rs

@@ -156,7 +156,7 @@ impl Audio {
     }
 
     #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-    pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source> {
+    pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source + Send> {
         let stream = rodio::microphone::MicrophoneBuilder::new()
             .default_device()?
             .default_config()?

crates/audio/src/audio_settings.rs

@@ -1,41 +1,62 @@
 use std::sync::atomic::{AtomicBool, Ordering};
 
+use anyhow::Result;
 use gpui::App;
-use settings::{Settings, SettingsStore};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsStore, SettingsUi};
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct AudioSettings {
     /// Opt into the new audio system.
+    #[serde(rename = "experimental.rodio_audio", default)]
     pub rodio_audio: bool, // default is false
     /// Requires 'rodio_audio: true'
     ///
     /// Use the new audio systems automatic gain control for your microphone.
     /// This affects how loud you sound to others.
+    #[serde(rename = "experimental.control_input_volume", default)]
     pub control_input_volume: bool,
     /// Requires 'rodio_audio: true'
     ///
     /// Use the new audio systems automatic gain control on everyone in the
     /// call. This makes call members who are too quite louder and those who are
     /// too loud quieter. This only affects how things sound for you.
+    #[serde(rename = "experimental.control_output_volume", default)]
+    pub control_output_volume: bool,
+}
+
+/// Configuration of audio in Zed.
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[serde(default)]
+#[settings_key(key = "audio")]
+pub struct AudioSettingsContent {
+    /// Opt into the new audio system.
+    #[serde(rename = "experimental.rodio_audio", default)]
+    pub rodio_audio: bool, // default is false
+    /// Requires 'rodio_audio: true'
+    ///
+    /// Use the new audio systems automatic gain control for your microphone.
+    /// This affects how loud you sound to others.
+    #[serde(rename = "experimental.control_input_volume", default)]
+    pub control_input_volume: bool,
+    /// Requires 'rodio_audio: true'
+    ///
+    /// Use the new audio systems automatic gain control on everyone in the
+    /// call. This makes call members who are too quite louder and those who are
+    /// too loud quieter. This only affects how things sound for you.
+    #[serde(rename = "experimental.control_output_volume", default)]
     pub control_output_volume: bool,
 }
 
-/// Configuration of audio in Zed
 impl Settings for AudioSettings {
-    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
-        let audio = &content.audio.as_ref().unwrap();
-        AudioSettings {
-            control_input_volume: audio.control_input_volume.unwrap(),
-            control_output_volume: audio.control_output_volume.unwrap(),
-            rodio_audio: audio.rodio_audio.unwrap(),
-        }
+    type FileContent = AudioSettingsContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
+        sources.json_merge()
     }
 
-    fn import_from_vscode(
-        _vscode: &settings::VsCodeSettings,
-        _current: &mut settings::SettingsContent,
-    ) {
-    }
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
 
 /// See docs on [LIVE_SETTINGS]

crates/audio/src/rodio_ext.rs

@@ -9,6 +9,8 @@ use std::{
 use crossbeam::queue::ArrayQueue;
 use rodio::{ChannelCount, Sample, SampleRate, Source};
 
+mod tee;
+
 #[derive(Debug, thiserror::Error)]
 #[error("Replay duration is too short must be >= 100ms")]
 pub struct ReplayDurationTooShort;

crates/audio/src/rodio_ext/tee.rs

@@ -0,0 +1,228 @@
+use std::{
+    sync::{Arc, Mutex},
+    thread::sleep,
+    time::Duration,
+};
+
+use log::warn;
+use rodio::{ChannelCount, Sample, SampleRate, Source};
+
+struct Subscriber {
+    tx: rtrb::Producer<Sample>,
+    name: Box<str>,
+}
+
+impl Subscriber {
+    fn fill(&self, buffer: &VecIter) {
+        match self.tx.write_chunk_uninit(buffer.len()) {
+            Ok(slots) => {
+                slots.fill_from_iter(buffer.iter());
+            }
+            Err(_not_enough_free_slots) => {
+                log::warn!("Audio consumer {} is lagging behind", self.name)
+            }
+        }
+    }
+}
+
+struct Owner<S> {
+    source: S,
+    subscribers: Vec<Subscriber>,
+}
+
+struct Tee<S> {
+    source: Arc<Mutex<Option<Owner<S>>>>,
+    state: TeeState<S>,
+    buffer: VecIter,
+    sample_rate: SampleRate,
+    channel_count: ChannelCount,
+}
+
+impl<S> Drop for Tee<S> {
+    fn drop(&mut self) {}
+}
+
+impl<S> Tee<S> {
+    fn clone(&self) -> Self {
+        Self { inner: todo!() }
+    }
+}
+
+impl<S: Source> Source for Tee<S> {
+    fn current_span_len(&self) -> Option<usize> {
+        None
+    }
+
+    fn channels(&self) -> rodio::ChannelCount {
+        self.channel_count
+    }
+
+    fn sample_rate(&self) -> rodio::SampleRate {
+        self.sample_rate
+    }
+
+    fn total_duration(&self) -> Option<std::time::Duration> {
+        todo!()
+    }
+}
+
+impl<S: Source> Iterator for Tee<S> {
+    type Item = Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(sample) = self.buffer.next() {
+            return Some(sample);
+        }
+        self.buffer.reset();
+        self.state.fill(self.buffer);
+    }
+}
+
+// Basically vec::IntoIter but you can fill it up again
+struct VecIter {
+    inner: Vec<Sample>,
+    next: usize,
+}
+
+impl Iterator for VecIter {
+    type Item = Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.next >= self.inner.len() {
+            None
+        } else {
+            let sample = self.inner[self.next];
+            self.next += 1;
+            Some(sample)
+        }
+    }
+}
+
+impl VecIter {
+    fn reset(&mut self) {
+        self.next = 0;
+        self.inner.clear();
+    }
+    fn is_full(&self) -> bool {
+        self.inner.len() == self.inner.capacity()
+    }
+    fn capacity(&self) -> usize {
+        self.inner.capacity()
+    }
+    fn len(&self) -> usize {
+        self.inner.len()
+    }
+    fn push(&mut self, sample: Sample) {
+        debug_assert_eq!(self.next, 0);
+        self.inner.push(sample)
+    }
+    fn extend(&mut self, samples: impl Iterator<Item = Sample>) {
+        debug_assert_eq!(self.next, 0);
+        self.inner.extend(samples)
+    }
+    fn iter<'a>(&'a self) -> core::slice::Iter<'a, Sample> {
+        self.inner.iter()
+    }
+}
+
+enum TeeState<S> {
+    Reading(rtrb::Consumer<Sample>),
+    Producing(Owner<S>),
+}
+impl<S: Source> TeeState<S> {
+    fn fill(&mut self, buffer: &mut VecIter) -> Option<()> {
+        match self {
+            Self::Reading(rx) => {
+                while !rx.is_abandoned() {
+                    let Ok(chunk) = rx.read_chunk(buffer.capacity()) else {
+                        // todo something smarter here? Use Nia's cool new perf
+                        // to figure out if it makes sense.
+                        sleep(Duration::from_millis(2));
+                        continue;
+                    };
+                    buffer.extend(chunk.into_iter());
+                }
+            }
+            Self::Producing(Owner {
+                source,
+                subscribers,
+            }) => {
+                buffer.push(source.next()?);
+                buffer.extend(source.take(buffer.capacity() - 1));
+                for sub in subscribers {
+                    sub.fill(buffer);
+                }
+            }
+        }
+        None
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{
+        sync::{
+            Arc,
+            atomic::{AtomicBool, Ordering},
+        },
+        thread,
+    };
+
+    use parking_lot::Mutex;
+
+    use super::*;
+
+    fn open_fake_microphone() -> impl rodio::Source {
+        static ALREADY_OPENED: AtomicBool = AtomicBool::new(false);
+        if ALREADY_OPENED.swap(true, Ordering::Relaxed) {
+            panic!()
+        } else {
+            rodio::source::SineWave::new(440.0)
+        }
+    }
+
+    // Todo make it so that if the final Tee clone drops the microphone drops too
+    #[test]
+    fn tomato() {
+        let microphone: Arc<Mutex<Option<Tee<_>>>> = Arc::new(Mutex::new(None));
+
+        let microphone1 = microphone.clone();
+        let t1 = thread::spawn(move || {
+            let mic = match &mut *microphone1.lock() {
+                Some(mic) => Tee::clone(mic),
+                none @ None => {
+                    let mic = Tee {
+                        inner: open_fake_microphone(),
+                    };
+                    let local_mic = Tee::clone(&mic);
+                    *none = Some(mic);
+                    none.as_mut().expect("just set to some");
+                    local_mic
+                }
+            };
+
+            mic.collect::<Vec<_>>()
+        });
+
+        let t2 = thread::spawn(move || {
+            let mic = match &mut *microphone.lock() {
+                Some(mic) => Tee::clone(mic),
+                none @ None => {
+                    let mic = Tee {
+                        inner: open_fake_microphone(),
+                    };
+                    let local_mic = Tee::clone(&mic);
+                    *none = Some(mic);
+                    none.as_mut().expect("just set to some");
+                    local_mic
+                }
+            };
+
+            mic.collect::<Vec<_>>()
+        });
+
+        let samples1 = t1.join().unwrap();
+        let samples2 = t2.join().unwrap();
+        assert_eq!(samples1, samples2)
+    }
+}

crates/auto_update/Cargo.toml

@@ -21,6 +21,7 @@ http_client.workspace = true
 log.workspace = true
 paths.workspace = true
 release_channel.workspace = true
+schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true

crates/auto_update/src/auto_update.rs

@@ -3,17 +3,16 @@ use client::{Client, TelemetrySettings};
 use db::RELEASE_CHANNEL;
 use db::kvp::KEY_VALUE_STORE;
 use gpui::{
-    App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, Global, SemanticVersion,
-    Task, Window, actions,
+    App, AppContext as _, AsyncApp, Context, Entity, Global, SemanticVersion, Task, Window, actions,
 };
 use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
 use paths::remote_servers_dir;
 use release_channel::{AppCommitSha, ReleaseChannel};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsStore, SettingsUi};
 use smol::{fs, io::AsyncReadExt};
 use smol::{fs::File, process::Command};
-use std::mem;
 use std::{
     env::{
         self,
@@ -86,49 +85,75 @@ pub struct JsonRelease {
     pub url: String,
 }
 
-struct MacOsUnmounter<'a> {
+struct MacOsUnmounter {
     mount_path: PathBuf,
-    background_executor: &'a BackgroundExecutor,
 }
 
-impl Drop for MacOsUnmounter<'_> {
+impl Drop for MacOsUnmounter {
     fn drop(&mut self) {
-        let mount_path = mem::take(&mut self.mount_path);
-        self.background_executor
-            .spawn(async move {
-                let unmount_output = Command::new("hdiutil")
-                    .args(["detach", "-force"])
-                    .arg(&mount_path)
-                    .output()
-                    .await;
-                match unmount_output {
-                    Ok(output) if output.status.success() => {
-                        log::info!("Successfully unmounted the disk image");
-                    }
-                    Ok(output) => {
-                        log::error!(
-                            "Failed to unmount disk image: {:?}",
-                            String::from_utf8_lossy(&output.stderr)
-                        );
-                    }
-                    Err(error) => {
-                        log::error!("Error while trying to unmount disk image: {:?}", error);
-                    }
-                }
-            })
-            .detach();
+        let unmount_output = std::process::Command::new("hdiutil")
+            .args(["detach", "-force"])
+            .arg(&self.mount_path)
+            .output();
+
+        match unmount_output {
+            Ok(output) if output.status.success() => {
+                log::info!("Successfully unmounted the disk image");
+            }
+            Ok(output) => {
+                log::error!(
+                    "Failed to unmount disk image: {:?}",
+                    String::from_utf8_lossy(&output.stderr)
+                );
+            }
+            Err(error) => {
+                log::error!("Error while trying to unmount disk image: {:?}", error);
+            }
+        }
     }
 }
 
-#[derive(Clone, Copy, Debug)]
 struct AutoUpdateSetting(bool);
 
 /// Whether or not to automatically check for updates.
 ///
 /// Default: true
+#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi, SettingsKey)]
+#[settings_key(None)]
+#[settings_ui(group = "Auto Update")]
+struct AutoUpdateSettingContent {
+    pub auto_update: Option<bool>,
+}
+
 impl Settings for AutoUpdateSetting {
-    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
-        Self(content.auto_update.unwrap())
+    type FileContent = AutoUpdateSettingContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
+        let auto_update = [
+            sources.server,
+            sources.release_channel,
+            sources.operating_system,
+            sources.user,
+        ]
+        .into_iter()
+        .find_map(|value| value.and_then(|val| val.auto_update))
+        .or(sources.default.auto_update)
+        .ok_or_else(Self::missing_default)?;
+
+        Ok(Self(auto_update))
+    }
+
+    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
+        let mut cur = &mut Some(*current);
+        vscode.enum_setting("update.mode", &mut cur, |s| match s {
+            "none" | "manual" => Some(AutoUpdateSettingContent {
+                auto_update: Some(false),
+            }),
+            _ => Some(AutoUpdateSettingContent {
+                auto_update: Some(true),
+            }),
+        });
+        *current = cur.unwrap();
     }
 }
 
@@ -904,7 +929,6 @@ async fn install_release_macos(
     // Create an MacOsUnmounter that will be dropped (and thus unmount the disk) when this function exits
     let _unmounter = MacOsUnmounter {
         mount_path: mount_path.clone(),
-        background_executor: cx.background_executor(),
     };
 
     let output = Command::new("rsync")
@@ -978,7 +1002,7 @@ mod tests {
     #[gpui::test]
     fn test_auto_update_defaults_to_true(cx: &mut TestAppContext) {
         cx.update(|cx| {
-            let mut store = SettingsStore::new(cx, &settings::default_settings());
+            let mut store = SettingsStore::new(cx);
             store
                 .set_default_settings(&default_settings(), cx)
                 .expect("Unable to set default settings");

crates/bedrock/src/models.rs

@@ -22,6 +22,7 @@ pub struct BedrockModelCacheConfiguration {
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum Model {
     // Anthropic models (already included)
+    #[default]
     #[serde(rename = "claude-sonnet-4", alias = "claude-sonnet-4-latest")]
     ClaudeSonnet4,
     #[serde(
@@ -29,14 +30,6 @@ pub enum Model {
         alias = "claude-sonnet-4-thinking-latest"
     )]
     ClaudeSonnet4Thinking,
-    #[default]
-    #[serde(rename = "claude-sonnet-4-5", alias = "claude-sonnet-4-5-latest")]
-    ClaudeSonnet4_5,
-    #[serde(
-        rename = "claude-sonnet-4-5-thinking",
-        alias = "claude-sonnet-4-5-thinking-latest"
-    )]
-    ClaudeSonnet4_5Thinking,
     #[serde(rename = "claude-opus-4", alias = "claude-opus-4-latest")]
     ClaudeOpus4,
     #[serde(rename = "claude-opus-4-1", alias = "claude-opus-4-1-latest")]
@@ -151,14 +144,6 @@ impl Model {
             Ok(Self::Claude3_7Sonnet)
         } else if id.starts_with("claude-3-7-sonnet-thinking") {
             Ok(Self::Claude3_7SonnetThinking)
-        } else if id.starts_with("claude-sonnet-4-5-thinking") {
-            Ok(Self::ClaudeSonnet4_5Thinking)
-        } else if id.starts_with("claude-sonnet-4-5") {
-            Ok(Self::ClaudeSonnet4_5)
-        } else if id.starts_with("claude-sonnet-4-thinking") {
-            Ok(Self::ClaudeSonnet4Thinking)
-        } else if id.starts_with("claude-sonnet-4") {
-            Ok(Self::ClaudeSonnet4)
         } else {
             anyhow::bail!("invalid model id {id}");
         }
@@ -168,8 +153,6 @@ impl Model {
         match self {
             Model::ClaudeSonnet4 => "claude-sonnet-4",
             Model::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking",
-            Model::ClaudeSonnet4_5 => "claude-sonnet-4-5",
-            Model::ClaudeSonnet4_5Thinking => "claude-sonnet-4-5-thinking",
             Model::ClaudeOpus4 => "claude-opus-4",
             Model::ClaudeOpus4_1 => "claude-opus-4-1",
             Model::ClaudeOpus4Thinking => "claude-opus-4-thinking",
@@ -231,9 +214,6 @@ impl Model {
             Model::ClaudeSonnet4 | Model::ClaudeSonnet4Thinking => {
                 "anthropic.claude-sonnet-4-20250514-v1:0"
             }
-            Model::ClaudeSonnet4_5 | Model::ClaudeSonnet4_5Thinking => {
-                "anthropic.claude-sonnet-4-5-20250929-v1:0"
-            }
             Model::ClaudeOpus4 | Model::ClaudeOpus4Thinking => {
                 "anthropic.claude-opus-4-20250514-v1:0"
             }
@@ -297,8 +277,6 @@ impl Model {
         match self {
             Self::ClaudeSonnet4 => "Claude Sonnet 4",
             Self::ClaudeSonnet4Thinking => "Claude Sonnet 4 Thinking",
-            Self::ClaudeSonnet4_5 => "Claude Sonnet 4.5",
-            Self::ClaudeSonnet4_5Thinking => "Claude Sonnet 4.5 Thinking",
             Self::ClaudeOpus4 => "Claude Opus 4",
             Self::ClaudeOpus4_1 => "Claude Opus 4.1",
             Self::ClaudeOpus4Thinking => "Claude Opus 4 Thinking",
@@ -368,8 +346,6 @@ impl Model {
             | Self::ClaudeOpus4
             | Self::ClaudeOpus4_1
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
             | Self::ClaudeOpus4Thinking
             | Self::ClaudeOpus4_1Thinking => 200_000,
             Self::AmazonNovaPremier => 1_000_000,
@@ -385,7 +361,6 @@ impl Model {
             Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3_5Haiku => 4_096,
             Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => 128_000,
             Self::ClaudeSonnet4 | Self::ClaudeSonnet4Thinking => 64_000,
-            Self::ClaudeSonnet4_5 | Self::ClaudeSonnet4_5Thinking => 64_000,
             Self::ClaudeOpus4
             | Self::ClaudeOpus4Thinking
             | Self::ClaudeOpus4_1
@@ -410,9 +385,7 @@ impl Model {
             | Self::ClaudeOpus4_1
             | Self::ClaudeOpus4_1Thinking
             | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking => 1.0,
+            | Self::ClaudeSonnet4Thinking => 1.0,
             Self::Custom {
                 default_temperature,
                 ..
@@ -436,8 +409,6 @@ impl Model {
             | Self::ClaudeOpus4_1Thinking
             | Self::ClaudeSonnet4
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
             | Self::Claude3_5Haiku => true,
 
             // Amazon Nova models (all support tool use)
@@ -468,8 +439,6 @@ impl Model {
             | Self::Claude3_7SonnetThinking
             | Self::ClaudeSonnet4
             | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
             | Self::ClaudeOpus4
             | Self::ClaudeOpus4Thinking
             | Self::ClaudeOpus4_1
@@ -519,11 +488,9 @@ impl Model {
             Model::Claude3_7SonnetThinking => BedrockModelMode::Thinking {
                 budget_tokens: Some(4096),
             },
-            Model::ClaudeSonnet4Thinking | Model::ClaudeSonnet4_5Thinking => {
-                BedrockModelMode::Thinking {
-                    budget_tokens: Some(4096),
-                }
-            }
+            Model::ClaudeSonnet4Thinking => BedrockModelMode::Thinking {
+                budget_tokens: Some(4096),
+            },
             Model::ClaudeOpus4Thinking | Model::ClaudeOpus4_1Thinking => {
                 BedrockModelMode::Thinking {
                     budget_tokens: Some(4096),
@@ -575,8 +542,6 @@ impl Model {
                 | Model::Claude3_7SonnetThinking
                 | Model::ClaudeSonnet4
                 | Model::ClaudeSonnet4Thinking
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking
                 | Model::ClaudeOpus4
                 | Model::ClaudeOpus4Thinking
                 | Model::ClaudeOpus4_1
@@ -610,8 +575,6 @@ impl Model {
                 | Model::Claude3_7SonnetThinking
                 | Model::ClaudeSonnet4
                 | Model::ClaudeSonnet4Thinking
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking
                 | Model::Claude3Haiku
                 | Model::Claude3Sonnet
                 | Model::MetaLlama321BInstructV1
@@ -629,9 +592,7 @@ impl Model {
                 | Model::Claude3_7Sonnet
                 | Model::Claude3_7SonnetThinking
                 | Model::ClaudeSonnet4
-                | Model::ClaudeSonnet4Thinking
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking,
+                | Model::ClaudeSonnet4Thinking,
                 "apac",
             ) => Ok(format!("{}.{}", region_group, model_id)),
 
@@ -670,10 +631,6 @@ mod tests {
             Model::ClaudeSonnet4.cross_region_inference_id("eu-west-1")?,
             "eu.anthropic.claude-sonnet-4-20250514-v1:0"
         );
-        assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("eu-west-1")?,
-            "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
-        );
         assert_eq!(
             Model::Claude3Sonnet.cross_region_inference_id("eu-west-1")?,
             "eu.anthropic.claude-3-sonnet-20240229-v1:0"

crates/call/Cargo.toml

@@ -35,6 +35,7 @@ language.workspace = true
 log.workspace = true
 postage.workspace = true
 project.workspace = true
+schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 telemetry.workspace = true

crates/call/src/call_settings.rs

@@ -1,24 +1,36 @@
+use anyhow::Result;
 use gpui::App;
-use settings::Settings;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
-#[derive(Debug)]
+#[derive(Deserialize, Debug)]
 pub struct CallSettings {
     pub mute_on_join: bool,
     pub share_on_join: bool,
 }
 
+/// Configuration of voice calls in Zed.
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "calls")]
+pub struct CallSettingsContent {
+    /// Whether the microphone should be muted when joining a channel or a call.
+    ///
+    /// Default: false
+    pub mute_on_join: Option<bool>,
+
+    /// Whether your current project should be shared when joining an empty channel.
+    ///
+    /// Default: false
+    pub share_on_join: Option<bool>,
+}
+
 impl Settings for CallSettings {
-    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
-        let call = content.calls.clone().unwrap();
-        CallSettings {
-            mute_on_join: call.mute_on_join.unwrap(),
-            share_on_join: call.share_on_join.unwrap(),
-        }
+    type FileContent = CallSettingsContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
+        sources.json_merge()
     }
 
-    fn import_from_vscode(
-        _vscode: &settings::VsCodeSettings,
-        _current: &mut settings::SettingsContent,
-    ) {
-    }
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }

crates/cli/src/main.rs

@@ -20,8 +20,6 @@ use util::paths::PathWithPosition;
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 use std::io::IsTerminal;
 
-const URL_PREFIX: [&'static str; 5] = ["zed://", "http://", "https://", "file://", "ssh://"];
-
 struct Detect;
 
 trait InstalledApp {
@@ -312,7 +310,12 @@ fn main() -> Result<()> {
     let wsl = None;
 
     for path in args.paths_with_position.iter() {
-        if URL_PREFIX.iter().any(|&prefix| path.starts_with(prefix)) {
+        if path.starts_with("zed://")
+            || path.starts_with("http://")
+            || path.starts_with("https://")
+            || path.starts_with("file://")
+            || path.starts_with("ssh://")
+        {
             urls.push(path.to_string());
         } else if path == "-" && args.paths_with_position.len() == 1 {
             let file = NamedTempFile::new()?;

crates/client/Cargo.toml

@@ -41,6 +41,7 @@ rand.workspace = true
 regex.workspace = true
 release_channel.workspace = true
 rpc = { workspace = true, features = ["gpui"] }
+schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_urlencoded.workspace = true

crates/client/src/client.rs

@@ -29,8 +29,9 @@ use proxy::connect_proxy_stream;
 use rand::prelude::*;
 use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EnvelopedMessage, PeerId, RequestMessage};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsContent};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use std::{
     any::TypeId,
     convert::TryFrom,
@@ -95,22 +96,35 @@ actions!(
     ]
 );
 
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
+pub struct ClientSettingsContent {
+    server_url: Option<String>,
+}
+
 #[derive(Deserialize)]
 pub struct ClientSettings {
     pub server_url: String,
 }
 
 impl Settings for ClientSettings {
-    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
+    type FileContent = ClientSettingsContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
+        let mut result = sources.json_merge::<Self>()?;
         if let Some(server_url) = &*ZED_SERVER_URL {
-            return Self {
-                server_url: server_url.clone(),
-            };
-        }
-        Self {
-            server_url: content.server_url.clone().unwrap(),
+            result.server_url.clone_from(server_url)
         }
+        Ok(result)
     }
+
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
+}
+
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
+pub struct ProxySettingsContent {
+    proxy: Option<String>,
 }
 
 #[derive(Deserialize, Default)]
@@ -133,13 +147,19 @@ impl ProxySettings {
 }
 
 impl Settings for ProxySettings {
-    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
-        Self {
-            proxy: content.proxy.clone(),
-        }
+    type FileContent = ProxySettingsContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
+        Ok(Self {
+            proxy: sources
+                .user
+                .or(sources.server)
+                .and_then(|value| value.proxy.clone())
+                .or(sources.default.proxy.clone()),
+        })
     }
 
-    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut SettingsContent) {
+    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
         vscode.string_setting("http.proxy", &mut current.proxy);
     }
 }
@@ -518,33 +538,37 @@ pub struct TelemetrySettings {
     pub metrics: bool,
 }
 
+/// Control what info is collected by Zed.
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "telemetry")]
+pub struct TelemetrySettingsContent {
+    /// Send debug info like crash reports.
+    ///
+    /// Default: true
+    pub diagnostics: Option<bool>,
+    /// Send anonymized usage data like what languages you're using Zed with.
+    ///
+    /// Default: true
+    pub metrics: Option<bool>,
+}
+
 impl settings::Settings for TelemetrySettings {
-    fn from_settings(content: &SettingsContent, _cx: &mut App) -> Self {
-        Self {
-            diagnostics: content.telemetry.as_ref().unwrap().diagnostics.unwrap(),
-            metrics: content.telemetry.as_ref().unwrap().metrics.unwrap(),
-        }
+    type FileContent = TelemetrySettingsContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
+        sources.json_merge()
     }
 
-    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut SettingsContent) {
-        let mut telemetry = settings::TelemetrySettingsContent::default();
-        vscode.enum_setting("telemetry.telemetryLevel", &mut telemetry.metrics, |s| {
+    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
+        vscode.enum_setting("telemetry.telemetryLevel", &mut current.metrics, |s| {
             Some(s == "all")
         });
-        vscode.enum_setting(
-            "telemetry.telemetryLevel",
-            &mut telemetry.diagnostics,
-            |s| Some(matches!(s, "all" | "error" | "crash")),
-        );
+        vscode.enum_setting("telemetry.telemetryLevel", &mut current.diagnostics, |s| {
+            Some(matches!(s, "all" | "error" | "crash"))
+        });
         // we could translate telemetry.telemetryLevel, but just because users didn't want
         // to send microsoft telemetry doesn't mean they don't want to send it to zed. their
         // all/error/crash/off correspond to combinations of our "diagnostics" and "metrics".
-        if let Some(diagnostics) = telemetry.diagnostics {
-            current.telemetry.get_or_insert_default().diagnostics = Some(diagnostics)
-        }
-        if let Some(metrics) = telemetry.metrics {
-            current.telemetry.get_or_insert_default().metrics = Some(metrics)
-        }
     }
 }
 

crates/cloud_api_client/src/cloud_api_client.rs

@@ -9,7 +9,7 @@ use futures::AsyncReadExt as _;
 use gpui::{App, Task};
 use gpui_tokio::Tokio;
 use http_client::http::request;
-use http_client::{AsyncBody, HttpClientWithUrl, HttpRequestExt, Method, Request, StatusCode};
+use http_client::{AsyncBody, HttpClientWithUrl, Method, Request, StatusCode};
 use parking_lot::RwLock;
 use yawc::WebSocket;
 
@@ -119,16 +119,15 @@ impl CloudApiClient {
         &self,
         system_id: Option<String>,
     ) -> Result<CreateLlmTokenResponse> {
-        let request_builder = Request::builder()
-            .method(Method::POST)
-            .uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/llm_tokens", &[])?
-                    .as_ref(),
-            )
-            .when_some(system_id, |builder, system_id| {
-                builder.header(ZED_SYSTEM_ID_HEADER_NAME, system_id)
-            });
+        let mut request_builder = Request::builder().method(Method::POST).uri(
+            self.http_client
+                .build_zed_cloud_url("/client/llm_tokens", &[])?
+                .as_ref(),
+        );
+
+        if let Some(system_id) = system_id {
+            request_builder = request_builder.header(ZED_SYSTEM_ID_HEADER_NAME, system_id);
+        }
 
         let request = self.build_request(request_builder, AsyncBody::default())?;
 

crates/cloud_llm_client/Cargo.toml

@@ -13,7 +13,6 @@ path = "src/cloud_llm_client.rs"
 
 [dependencies]
 anyhow.workspace = true
-chrono.workspace = true
 serde = { workspace = true, features = ["derive", "rc"] }
 serde_json.workspace = true
 strum = { workspace = true, features = ["derive"] }

crates/cloud_llm_client/src/cloud_llm_client.rs

@@ -1,5 +1,3 @@
-pub mod predict_edits_v3;
-
 use std::str::FromStr;
 use std::sync::Arc;
 
@@ -55,9 +53,6 @@ pub const CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME: &str =
 pub const SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME: &str =
     "x-zed-server-supports-status-messages";
 
-/// The name of the header used by the client to indicate that it supports receiving xAI models.
-pub const CLIENT_SUPPORTS_X_AI_HEADER_NAME: &str = "x-zed-client-supports-x-ai";
-
 #[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum UsageLimit {
@@ -147,7 +142,6 @@ pub enum LanguageModelProvider {
     Anthropic,
     OpenAi,
     Google,
-    XAi,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

crates/cloud_llm_client/src/predict_edits_v3.rs

@@ -1,127 +0,0 @@
-use chrono::Duration;
-use serde::{Deserialize, Serialize};
-use std::{ops::Range, path::PathBuf};
-use uuid::Uuid;
-
-use crate::PredictEditsGitInfo;
-
-// TODO: snippet ordering within file / relative to excerpt
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PredictEditsRequest {
-    pub excerpt: String,
-    pub excerpt_path: PathBuf,
-    /// Within file
-    pub excerpt_range: Range<usize>,
-    /// Within `excerpt`
-    pub cursor_offset: usize,
-    /// Within `signatures`
-    pub excerpt_parent: Option<usize>,
-    pub signatures: Vec<Signature>,
-    pub referenced_declarations: Vec<ReferencedDeclaration>,
-    pub events: Vec<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>,
-    // Only available to staff
-    #[serde(default)]
-    pub debug_info: bool,
-    pub prompt_max_bytes: Option<usize>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "event")]
-pub enum Event {
-    BufferChange {
-        path: Option<PathBuf>,
-        old_path: Option<PathBuf>,
-        diff: String,
-        predicted: bool,
-    },
-}
-
-#[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<usize>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ReferencedDeclaration {
-    pub path: PathBuf,
-    pub text: String,
-    pub text_is_truncated: bool,
-    /// Range of `text` within file, possibly truncated according to `text_is_truncated`
-    pub range: Range<usize>,
-    /// 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: ScoreComponents,
-    pub signature_score: f32,
-    pub declaration_score: f32,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ScoreComponents {
-    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 declaration_line_distance_rank: usize,
-    pub containing_range_vs_item_jaccard: f32,
-    pub containing_range_vs_signature_jaccard: f32,
-    pub adjacent_vs_item_jaccard: f32,
-    pub adjacent_vs_signature_jaccard: f32,
-    pub containing_range_vs_item_weighted_overlap: f32,
-    pub containing_range_vs_signature_weighted_overlap: f32,
-    pub adjacent_vs_item_weighted_overlap: f32,
-    pub adjacent_vs_signature_weighted_overlap: f32,
-}
-
-#[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,
-    pub edits: Vec<Edit>,
-    pub debug_info: Option<DebugInfo>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct DebugInfo {
-    pub prompt: String,
-    pub prompt_planning_time: Duration,
-    pub model_response: String,
-    pub inference_time: Duration,
-    pub parsing_time: Duration,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Edit {
-    pub path: PathBuf,
-    pub range: Range<usize>,
-    pub content: String,
-}
-
-fn is_default<T: Default + PartialEq>(value: &T) -> bool {
-    *value == T::default()
-}

crates/cloud_zeta2_prompt/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "cloud_zeta2_prompt"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/cloud_zeta2_prompt.rs"
-
-[dependencies]
-anyhow.workspace = true
-cloud_llm_client.workspace = true
-indoc.workspace = true
-ordered-float.workspace = true
-rustc-hash.workspace = true
-strum.workspace = true
-workspace-hack.workspace = true

crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs

@@ -1,461 +0,0 @@
-//! Zeta2 prompt planning and generation code shared with cloud.
-
-use anyhow::{Result, anyhow};
-use cloud_llm_client::predict_edits_v3::{self, Event, ReferencedDeclaration};
-use indoc::indoc;
-use ordered_float::OrderedFloat;
-use rustc_hash::{FxHashMap, FxHashSet};
-use std::fmt::Write;
-use std::{cmp::Reverse, collections::BinaryHeap, ops::Range, path::Path};
-use strum::{EnumIter, IntoEnumIterator};
-
-pub const DEFAULT_MAX_PROMPT_BYTES: usize = 10 * 1024;
-
-pub const CURSOR_MARKER: &str = "<|user_cursor_is_here|>";
-/// NOTE: Differs from zed version of constant - includes a newline
-pub const EDITABLE_REGION_START_MARKER_WITH_NEWLINE: &str = "<|editable_region_start|>\n";
-/// 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?
-pub const SYSTEM_PROMPT: &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_is_here|>. Please respond with edited code for that region.
-"};
-
-pub struct PlannedPrompt<'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,
-}
-
-pub struct PlanOptions {
-    pub max_bytes: usize,
-}
-
-#[derive(Clone, Debug)]
-pub struct PlannedSnippet<'a> {
-    path: &'a Path,
-    range: Range<usize>,
-    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 SnippetStyle {
-    Signature,
-    Declaration,
-}
-
-impl<'a> PlannedPrompt<'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 SnippetStyle
-    /// 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,
-        options: &PlanOptions,
-    ) -> Result<Self> {
-        let mut this = PlannedPrompt {
-            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);
-
-        if this.budget_used > options.max_bytes {
-            return Err(anyhow!(
-                "Excerpt + signatures size of {} already exceeds budget of {}",
-                this.budget_used,
-                options.max_bytes
-            ));
-        }
-
-        #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-        struct QueueEntry {
-            score_density: OrderedFloat<f32>,
-            declaration_index: usize,
-            style: SnippetStyle,
-        }
-
-        // 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) = SnippetStyle::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 > options.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 > options.max_bytes {
-                continue;
-            }
-
-            this.budget_used += additional_bytes;
-            this.add_parents(&mut included_parents, additional_parents);
-            let planned_snippet = match queue_entry.style {
-                SnippetStyle::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()
-                        ));
-                    };
-                    PlannedSnippet {
-                        path: &declaration.path,
-                        range: (declaration.signature_range.start + declaration.range.start)
-                            ..(declaration.signature_range.end + declaration.range.start),
-                        text,
-                        text_is_truncated: declaration.text_is_truncated,
-                    }
-                }
-                SnippetStyle::Declaration => PlannedSnippet {
-                    path: &declaration.path,
-                    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 == SnippetStyle::Signature {
-                let signature_size = declaration_size(&declaration, SnippetStyle::Signature);
-                let declaration_size = declaration_size(&declaration, SnippetStyle::Declaration);
-                let signature_score = declaration_score(&declaration, SnippetStyle::Signature);
-                let declaration_score = declaration_score(&declaration, SnippetStyle::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: SnippetStyle::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: &'a 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: &'a 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,
-                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 to_prompt_string(&self) -> String {
-        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 {
-                excerpt_file_snippets = snippets;
-            } else {
-                file_snippets.push((file_path, snippets, false));
-            }
-        }
-        let excerpt_snippet = PlannedSnippet {
-            path: &self.request.excerpt_path,
-            range: self.request.excerpt_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 mut excerpt_file_insertions = vec![
-            (
-                self.request.excerpt_range.start,
-                EDITABLE_REGION_START_MARKER_WITH_NEWLINE,
-            ),
-            (
-                self.request.excerpt_range.start + self.request.cursor_offset,
-                CURSOR_MARKER,
-            ),
-            (
-                self.request
-                    .excerpt_range
-                    .end
-                    .saturating_sub(0)
-                    .max(self.request.excerpt_range.start),
-                EDITABLE_REGION_END_MARKER_WITH_NEWLINE,
-            ),
-        ];
-
-        let mut output = String::new();
-        output.push_str("## User Edits\n\n");
-        Self::push_events(&mut output, &self.request.events);
-
-        output.push_str("\n## Code\n\n");
-        Self::push_file_snippets(&mut output, &mut excerpt_file_insertions, file_snippets);
-        output
-    }
-
-    fn push_events(output: &mut String, events: &[predict_edits_v3::Event]) {
-        for event in events {
-            match event {
-                Event::BufferChange {
-                    path,
-                    old_path,
-                    diff,
-                    predicted,
-                } => {
-                    if let Some(old_path) = &old_path
-                        && let Some(new_path) = &path
-                    {
-                        if old_path != new_path {
-                            writeln!(
-                                output,
-                                "User renamed {} to {}\n\n",
-                                old_path.display(),
-                                new_path.display()
-                            )
-                            .unwrap();
-                        }
-                    }
-
-                    let path = path
-                        .as_ref()
-                        .map_or_else(|| "untitled".to_string(), |path| path.display().to_string());
-
-                    if *predicted {
-                        writeln!(
-                            output,
-                            "User accepted prediction {:?}:\n```diff\n{}\n```\n",
-                            path, diff
-                        )
-                        .unwrap();
-                    } else {
-                        writeln!(output, "User edited {:?}:\n```diff\n{}\n```\n", path, diff)
-                            .unwrap();
-                    }
-                }
-            }
-        }
-    }
-
-    fn push_file_snippets(
-        output: &mut String,
-        excerpt_file_insertions: &mut Vec<(usize, &'static str)>,
-        file_snippets: Vec<(&Path, Vec<&PlannedSnippet>, bool)>,
-    ) {
-        fn push_excerpt_file_range(
-            range: Range<usize>,
-            text: &str,
-            excerpt_file_insertions: &mut Vec<(usize, &'static str)>,
-            output: &mut String,
-        ) {
-            let mut last_offset = range.start;
-            let mut i = 0;
-            while i < excerpt_file_insertions.len() {
-                let (offset, insertion) = &excerpt_file_insertions[i];
-                let found = *offset >= range.start && *offset <= range.end;
-                if found {
-                    output.push_str(&text[last_offset - range.start..offset - range.start]);
-                    output.push_str(insertion);
-                    last_offset = *offset;
-                    excerpt_file_insertions.remove(i);
-                    continue;
-                }
-                i += 1;
-            }
-            output.push_str(&text[last_offset - range.start..]);
-        }
-
-        for (file_path, mut snippets, is_excerpt_file) in file_snippets {
-            output.push_str(&format!("```{}\n", file_path.display()));
-
-            let mut last_included_range: Option<Range<usize>> = None;
-            snippets.sort_by_key(|s| (s.range.start, Reverse(s.range.end)));
-            for snippet in snippets {
-                if let Some(last_range) = &last_included_range
-                    && snippet.range.start < last_range.end
-                {
-                    if snippet.range.end <= last_range.end {
-                        continue;
-                    }
-                    // TODO: Should probably also handle case where there is just one char (newline)
-                    // between snippets - assume it's a newline.
-                    let text = &snippet.text[last_range.end - snippet.range.start..];
-                    if is_excerpt_file {
-                        push_excerpt_file_range(
-                            last_range.end..snippet.range.end,
-                            text,
-                            excerpt_file_insertions,
-                            output,
-                        );
-                    } else {
-                        output.push_str(text);
-                    }
-                    last_included_range = Some(last_range.start..snippet.range.end);
-                    continue;
-                }
-                if last_included_range.is_some() {
-                    output.push_str("…\n");
-                }
-                if is_excerpt_file {
-                    push_excerpt_file_range(
-                        snippet.range.clone(),
-                        snippet.text,
-                        excerpt_file_insertions,
-                        output,
-                    );
-                } else {
-                    output.push_str(snippet.text);
-                }
-                last_included_range = Some(snippet.range.clone());
-            }
-
-            output.push_str("```\n\n");
-        }
-    }
-}
-
-fn declaration_score_density(declaration: &ReferencedDeclaration, style: SnippetStyle) -> f32 {
-    declaration_score(declaration, style) / declaration_size(declaration, style) as f32
-}
-
-fn declaration_score(declaration: &ReferencedDeclaration, style: SnippetStyle) -> f32 {
-    match style {
-        SnippetStyle::Signature => declaration.signature_score,
-        SnippetStyle::Declaration => declaration.declaration_score,
-    }
-}
-
-fn declaration_size(declaration: &ReferencedDeclaration, style: SnippetStyle) -> usize {
-    match style {
-        SnippetStyle::Signature => declaration.signature_range.len(),
-        SnippetStyle::Declaration => declaration.text.len(),
-    }
-}

crates/collab/src/db/queries/channels.rs

@@ -1129,3 +1129,8 @@ async fn max_order(parent_path: &str, tx: &TransactionHandle) -> Result<i32> {
 enum QueryIds {
     Id,
 }
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+enum QueryUserIds {
+    UserId,
+}

crates/collab/src/db/queries/users.rs

@@ -342,6 +342,79 @@ impl Database {
         result
     }
 
+    /// Returns all feature flags.
+    pub async fn list_feature_flags(&self) -> Result<Vec<feature_flag::Model>> {
+        self.transaction(|tx| async move { Ok(feature_flag::Entity::find().all(&*tx).await?) })
+            .await
+    }
+
+    /// Creates a new feature flag.
+    pub async fn create_user_flag(&self, flag: &str, enabled_for_all: bool) -> Result<FlagId> {
+        self.transaction(|tx| async move {
+            let flag = feature_flag::Entity::insert(feature_flag::ActiveModel {
+                flag: ActiveValue::set(flag.to_string()),
+                enabled_for_all: ActiveValue::set(enabled_for_all),
+                ..Default::default()
+            })
+            .exec(&*tx)
+            .await?
+            .last_insert_id;
+
+            Ok(flag)
+        })
+        .await
+    }
+
+    /// Add the given user to the feature flag
+    pub async fn add_user_flag(&self, user: UserId, flag: FlagId) -> Result<()> {
+        self.transaction(|tx| async move {
+            user_feature::Entity::insert(user_feature::ActiveModel {
+                user_id: ActiveValue::set(user),
+                feature_id: ActiveValue::set(flag),
+            })
+            .exec(&*tx)
+            .await?;
+
+            Ok(())
+        })
+        .await
+    }
+
+    /// Returns the active flags for the user.
+    pub async fn get_user_flags(&self, user: UserId) -> Result<Vec<String>> {
+        self.transaction(|tx| async move {
+            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+            enum QueryAs {
+                Flag,
+            }
+
+            let flags_enabled_for_all = feature_flag::Entity::find()
+                .filter(feature_flag::Column::EnabledForAll.eq(true))
+                .select_only()
+                .column(feature_flag::Column::Flag)
+                .into_values::<_, QueryAs>()
+                .all(&*tx)
+                .await?;
+
+            let flags_enabled_for_user = user::Model {
+                id: user,
+                ..Default::default()
+            }
+            .find_linked(user::UserFlags)
+            .select_only()
+            .column(feature_flag::Column::Flag)
+            .into_values::<_, QueryAs>()
+            .all(&*tx)
+            .await?;
+
+            let mut all_flags = HashSet::from_iter(flags_enabled_for_all);
+            all_flags.extend(flags_enabled_for_user);
+
+            Ok(all_flags.into_iter().collect())
+        })
+        .await
+    }
+
     pub async fn get_users_missing_github_user_created_at(&self) -> Result<Vec<user::Model>> {
         self.transaction(|tx| async move {
             Ok(user::Entity::find()

crates/collab/src/db/tables.rs

@@ -13,6 +13,7 @@ pub mod contributor;
 pub mod embedding;
 pub mod extension;
 pub mod extension_version;
+pub mod feature_flag;
 pub mod follower;
 pub mod language_server;
 pub mod notification;
@@ -28,6 +29,7 @@ pub mod room_participant;
 pub mod server;
 pub mod signup;
 pub mod user;
+pub mod user_feature;
 pub mod worktree;
 pub mod worktree_diagnostic_summary;
 pub mod worktree_entry;