Remove cli example

Return 0 results when declaration count limit exceeded
Co-authored-by: Agus <agus@zed.dev>
2025-09-17 18:13:51 -06:00 · 2025-09-17 18:10:32 -06:00 · 2025-09-17 18:10:32 -06:00 · 2025-09-17 17:07:30 -06:00 · 2025-09-17 15:02:57 -06:00 · 2025-09-17 15:00:29 -06:00
759 changed files with 27478 additions and 37435 deletions
--- a/.cargo/ci-config.toml
+++ b/.cargo/ci-config.toml
@@ -10,15 +10,3 @@
 # Here, we opted to use `[target.'cfg(all())']` instead of `[build]` because `[target.'**']` is guaranteed to be cumulative.
 [target.'cfg(all())']
 rustflags = ["-D", "warnings"]
-
-# Use Mold on Linux, because it's faster than GNU ld and LLD.
-#
-# We no longer set this in the default `config.toml` so that developers can opt in to Wild, which
-# is faster than Mold, in their own ~/.cargo/config.toml.
-[target.x86_64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
-
-[target.aarch64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -4,9 +4,14 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]

 [alias]
 xtask = "run --package xtask --"
-perf-test = ["test", "--profile", "release-fast", "--lib", "--bins", "--tests", "--all-features", "--config", "target.'cfg(true)'.runner='cargo run -p perf --release'", "--config", "target.'cfg(true)'.rustflags=[\"--cfg\", \"perf_enabled\"]"]
-# Keep similar flags here to share some ccache
-perf-compare = ["run", "--profile", "release-fast", "-p", "perf", "--config", "target.'cfg(true)'.rustflags=[\"--cfg\", \"perf_enabled\"]", "--", "compare"]
+
+[target.x86_64-unknown-linux-gnu]
+linker = "clang"
+rustflags = ["-C", "link-arg=-fuse-ld=mold"]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "clang"
+rustflags = ["-C", "link-arg=-fuse-ld=mold"]

 [target.'cfg(target_os = "windows")']
 rustflags = [
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -26,7 +26,7 @@ third-party = [
    # build of remote_server should not include scap / its x11 dependency
    { name = "scap", git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7" },
    # build of remote_server should not need to include on libalsa through rodio
-    { name = "rodio", git = "https://github.com/RustAudio/rodio" },
+    { name = "rodio", git = "https://github.com/RustAudio/rodio", branch = "better_wav_output"},
 ]

 [final-excludes]
--- a/.github/ISSUE_TEMPLATE/07_bug_windows_alpha.yml
+++ b/.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:
--- a/.github/workflows/community_champion_auto_labeler.yml
+++ b/.github/workflows/community_champion_auto_labeler.yml
@@ -1,48 +0,0 @@
-name: Community Champion Auto Labeler
-
-on:
-  issues:
-    types: [opened]
-  pull_request_target:
-    types: [opened]
-
-jobs:
-  label_community_champion:
-    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check if author is a community champion and apply label
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const communityChampionBody = `${{ secrets.COMMUNITY_CHAMPIONS }}`;
-
-            const communityChampions = communityChampionBody
-              .split('\n')
-              .map(handle => handle.trim().toLowerCase());
-
-            let author;
-            if (context.eventName === 'issues') {
-              author = context.payload.issue.user.login;
-            } else if (context.eventName === 'pull_request_target') {
-              author = context.payload.pull_request.user.login;
-            }
-
-            if (!author || !communityChampions.includes(author.toLowerCase())) {
-              return;
-            }
-
-            const issueNumber = context.payload.issue?.number || context.payload.pull_request?.number;
-
-            try {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                labels: ['community champion']
-              });
-
-              console.log(`Applied 'community champion' label to #${issueNumber} by ${author}`);
-            } catch (error) {
-              console.error(`Failed to apply label: ${error.message}`);
-            }
--- a/.github/workflows/community_release_actions.yml
+++ b/.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"
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@
 .venv
 .vscode
 .wrangler
-.perf-runs
 /assets/*licenses.*
 /crates/collab/seed.json
 /crates/theme/schemas/theme.json
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -63,7 +63,6 @@ Although there are few hard and fast rules, typically we don't merge:
 - New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
 - Giant refactorings.
 - Non-trivial changes with no tests.
- Stylistic code changes that do not alter any app logic. Reducing allocations, removing `.unwrap()`s, fixing typos is great; making code "more readable" — maybe not so much.
 - Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
 - Anything that seems completely AI generated.

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/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",
@@ -90,8 +88,9 @@ members = [
    "crates/image_viewer",
    "crates/inspector_ui",
    "crates/install_cli",
+    "crates/jj",
+    "crates/jj_ui",
    "crates/journal",
-    "crates/json_schema_store",
    "crates/keymap_editor",
    "crates/language",
    "crates/language_extension",
@@ -150,9 +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,11 +315,11 @@ 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" }
+jj_ui = { path = "crates/jj_ui" }
 journal = { path = "crates/journal" }
-json_schema_store = { path = "crates/json_schema_store" }
 keymap_editor = { path = "crates/keymap_editor" }
 language = { path = "crates/language" }
 language_extension = { path = "crates/language_extension" }
@@ -358,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" }
@@ -378,7 +373,7 @@ remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
-rodio = { git = "https://github.com/RustAudio/rodio" }
+rodio = { git = "https://github.com/RustAudio/rodio", branch = "better_wav_output"}
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
@@ -386,8 +381,8 @@ search = { path = "crates/search" }
 semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
-settings_macros = { path = "crates/settings_macros" }
 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"] }
@@ -514,7 +508,6 @@ futures-lite = "1.13"
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
 handlebars = "4.3"
-hashbrown = "0.15.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
@@ -530,6 +523,7 @@ indexmap = { version = "2.7.0", features = ["serde"] }
 indoc = "2"
 inventory = "0.3.19"
 itertools = "0.14.0"
+jj-lib = { git = "https://github.com/jj-vcs/jj", rev = "e18eb8e05efaa153fad5ef46576af145bba1807f" }
 json_dotpath = "1.1"
 jsonschema = "0.30.0"
 jsonwebtoken = "9.3"
@@ -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"
@@ -686,7 +679,7 @@ tree-sitter-html = "0.23"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.24"
 tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
-tree-sitter-python = "0.25"
+tree-sitter-python = { git = "https://github.com/zed-industries/tree-sitter-python", rev = "218fcbf3fda3d029225f3dec005cb497d111b35e" }
 tree-sitter-regex = "0.24"
 tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.24"
@@ -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",
@@ -813,7 +804,6 @@ image_viewer = { codegen-units = 1 }
 edit_prediction_button = { codegen-units = 1 }
 install_cli = { codegen-units = 1 }
 journal = { codegen-units = 1 }
-json_schema_store = { codegen-units = 1 }
 lmstudio = { codegen-units = 1 }
 menu = { codegen-units = 1 }
 notifications = { codegen-units = 1 }
@@ -865,7 +855,6 @@ todo = "deny"
 declare_interior_mutable_const = "deny"

 redundant_clone = "deny"
-disallowed_methods = "deny"

 # We currently do not restrict any style rules
 # as it slows down shipping code to Zed.
--- a/2
+++ b/2
@@ -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 . .

--- a/assets/icons/linux.svg
+++ b/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>
--- a/assets/keymaps/default-linux.json
+++ b/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,
--- a/assets/keymaps/default-macos.json
+++ b/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,
--- a/assets/keymaps/default-windows.json
+++ b/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",
@@ -345,7 +346,7 @@
    }
  },
  {
-    "context": "AcpThread > Editor && !use_modifier_to_send",
+    "context": "AcpThread > Editor",
    "use_key_equivalents": true,
    "bindings": {
      "enter": "agent::Chat",
@@ -355,17 +356,6 @@
      "shift-tab": "agent::CycleModeSelector"
    }
  },
-  {
-    "context": "AcpThread > Editor && use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "agent::Chat",
-      "ctrl-shift-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
-      "shift-tab": "agent::CycleModeSelector"
-    }
-  },
  {
    "context": "ThreadHistory",
    "use_key_equivalents": true,
@@ -475,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",
@@ -507,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
@@ -618,6 +610,8 @@
      "shift-alt--": ["workspace::DecreaseActiveDockSize", { "px": 0 }],
      "shift-alt-=": ["workspace::IncreaseActiveDockSize", { "px": 0 }],
      "shift-alt-0": "workspace::ResetOpenDocksSize",
+      "ctrl-shift-alt--": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
+      "ctrl-shift-alt-=": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
      "ctrl-shift-f": "pane::DeploySearch",
      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
      "ctrl-shift-t": "pane::ReopenClosedItem",
@@ -1121,7 +1115,6 @@
      "alt-f": ["terminal::SendText", "\u001bf"],
      "alt-.": ["terminal::SendText", "\u001b."],
      "ctrl-delete": ["terminal::SendText", "\u001bd"],
-      "ctrl-n": "workspace::NewTerminal",
      // Overrides for conflicting keybindings
      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
@@ -1167,13 +1160,6 @@
      "ctrl-enter": "menu::Confirm"
    }
  },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
  {
    "context": "OnboardingAiConfigurationModal",
    "use_key_equivalents": true,
@@ -1258,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"
    }
  }
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -4,7 +4,6 @@
 // from the command palette.
 [
  {
-    "context": "!GitPanel",
    "bindings": {
      "ctrl-g": "menu::Cancel"
    }
--- a/assets/keymaps/vim.json
+++ b/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",
@@ -426,7 +426,6 @@
      ";": "vim::HelixCollapseSelection",
      ":": "command_palette::Toggle",
      "m": "vim::PushHelixMatch",
-      "s": "vim::HelixSelectRegex",
      "]": ["vim::PushHelixNext", { "around": true }],
      "[": ["vim::PushHelixPrevious", { "around": true }],
      "left": "vim::WrappingLeft",
@@ -434,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 }],
@@ -445,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",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -115,7 +115,6 @@
  // Whether to enable vim modes and key bindings.
  "vim_mode": false,
  // Whether to enable helix mode and key bindings.
-  // Enabling this mode will automatically enable vim mode.
  "helix_mode": false,
  // Whether to show the informational hover box when moving the mouse
  // over symbols in the editor.
@@ -312,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,
@@ -392,6 +391,8 @@
  "use_system_window_tabs": false,
  // Titlebar related settings
  "title_bar": {
+    // When to show the title bar: "always" | "never" | "hide_in_full_screen".
+    "show": "always",
    // Whether to show the branch icon beside branch switcher in the titlebar.
    "show_branch_icon": false,
    // Whether to show the branch name button in the titlebar.
@@ -407,39 +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'
-    //
-    // Automatically increase or decrease you microphone's volume. This affects how
-    // loud you sound to others.
-    //
-    // Recommended: off (default)
-    // Microphones are too quite in zed, until everyone is on experimental
-    // audio and has auto speaker volume on this will make you very loud
-    // compared to other speakers.
-    "experimental.auto_microphone_volume": false,
-    // Requires 'rodio_audio: true'
-    //
-    // Automatically increate or decrease the volume of other call members.
-    // This only affects how things sound for you.
-    "experimental.auto_speaker_volume": true,
-    // Requires 'rodio_audio: true'
-    //
-    // Remove background noises. Works great for typing, cars, dogs, AC. Does
-    // not work well on music.
-    "experimental.denoise": true,
-    // Requires 'rodio_audio: true'
-    //
-    // Use audio parameters compatible with the previous versions of
-    // experimental audio and non-experimental audio. When this is false you
-    // will sound strange to anyone not on the latest experimental audio. In
-    // the future we will migrate by setting this to false
-    //
-    // You need to rejoin a call for this setting to apply
-    "experimental.legacy_audio_compatible": true
-  },
  // Scrollbar related settings
  "scrollbar": {
    // When to show the scrollbar in the editor.
@@ -620,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.
@@ -829,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,
@@ -839,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.
@@ -942,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.
@@ -970,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.
  //
@@ -1302,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": {
@@ -1431,7 +1393,7 @@
    //         "line_height": {
    //           "custom": 2
    //         },
-    "line_height": "standard",
+    "line_height": "comfortable",
    // Activate the python virtual environment, if one is found, in the
    // terminal's working directory (as resolved by the working_directory
    // setting). Set this to "off" to disable this behavior.
@@ -1451,7 +1413,7 @@
      //
      // The shell running in the terminal needs to be configured to emit the title.
      // Example: `echo -e "\e]2;New Title\007";`
-      "breadcrumbs": false
+      "breadcrumbs": true
    },
    // Scrollbar-related settings
    "scrollbar": {
@@ -1531,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
@@ -1811,7 +1773,6 @@
    "anthropic": {
      "api_url": "https://api.anthropic.com"
    },
-    "bedrock": {},
    "google": {
      "api_url": "https://generativelanguage.googleapis.com"
    },
@@ -1833,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
@@ -1889,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.
@@ -1900,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"
@@ -2032,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": []
 }
--- a/assets/settings/initial_tasks.json
+++ b/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": []
  }
--- a/assets/sounds/guest_joined_call.wav
+++ b/assets/sounds/guest_joined_call.wav
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -239,7 +239,7 @@
          "hint": {
            "color": "#628b80ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#ff8f3fff",
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -248,7 +248,7 @@
          "hint": {
            "color": "#8c957dff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#fb4833ff",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -244,7 +244,7 @@
          "hint": {
            "color": "#788ca6ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#b477cfff",
--- a/clippy.toml
+++ b/clippy.toml
@@ -5,14 +5,3 @@ ignore-interior-mutability = [
    # and Hash impls do not use fields with interior mutability.
    "agent::context::AgentContextKey"
 ]
-disallowed-methods = [
-    { path = "std::process::Command::spawn", reason = "Spawning `std::process::Command` can block the current thread for an unknown duration", replacement = "smol::process::Command::spawn" },
-    { path = "std::process::Command::output", reason = "Spawning `std::process::Command` can block the current thread for an unknown duration", replacement = "smol::process::Command::output" },
-    { path = "std::process::Command::status", reason = "Spawning `std::process::Command` can block the current thread for an unknown duration", replacement = "smol::process::Command::status" },
-]
-disallowed-types = [
-    # { path = "std::collections::HashMap", replacement = "collections::HashMap" },
-    # { path = "std::collections::HashSet", replacement = "collections::HashSet" },
-    # { path = "indexmap::IndexSet", replacement = "collections::IndexSet" },
-    # { path = "indexmap::IndexMap", replacement = "collections::IndexMap" },
-]
--- a/compose.yml
+++ b/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
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -573,7 +573,7 @@ impl ToolCallContent {
            ))),
            acp::ToolCallContent::Diff { diff } => Ok(Self::Diff(cx.new(|cx| {
                Diff::finalized(
-                    diff.path.to_string_lossy().into_owned(),
+                    diff.path,
                    diff.old_text,
                    diff.new_text,
                    language_registry,
@@ -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);
--- a/crates/acp_thread/src/connection.rs
+++ b/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);

--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -6,7 +6,12 @@ use itertools::Itertools;
 use language::{
    Anchor, Buffer, Capability, LanguageRegistry, OffsetRangeExt as _, Point, Rope, TextBuffer,
 };
-use std::{cmp::Reverse, ops::Range, path::Path, sync::Arc};
+use std::{
+    cmp::Reverse,
+    ops::Range,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
 use util::ResultExt;

 pub enum Diff {
@@ -16,7 +21,7 @@ pub enum Diff {

 impl Diff {
    pub fn finalized(
-        path: String,
+        path: PathBuf,
        old_text: Option<String>,
        new_text: String,
        language_registry: Arc<LanguageRegistry>,
@@ -31,7 +36,7 @@ impl Diff {
            let buffer = new_buffer.clone();
            async move |_, cx| {
                let language = language_registry
-                    .language_for_file_path(Path::new(&path))
+                    .language_for_file_path(&path)
                    .await
                    .log_err();

@@ -147,15 +152,12 @@ impl Diff {
        let path = match self {
            Diff::Pending(PendingDiff {
                new_buffer: buffer, ..
-            }) => buffer
-                .read(cx)
-                .file()
-                .map(|file| file.path().display(file.path_style(cx))),
-            Diff::Finalized(FinalizedDiff { path, .. }) => Some(path.as_str().into()),
+            }) => buffer.read(cx).file().map(|file| file.path().as_ref()),
+            Diff::Finalized(FinalizedDiff { path, .. }) => Some(path.as_path()),
        };
        format!(
            "Diff: {}\n```\n{}\n```\n",
-            path.unwrap_or("untitled".into()),
+            path.unwrap_or(Path::new("untitled")).display(),
            buffer_text
        )
    }
@@ -242,8 +244,8 @@ impl PendingDiff {
            .new_buffer
            .read(cx)
            .file()
-            .map(|file| file.path().display(file.path_style(cx)))
-            .unwrap_or("untitled".into())
+            .map(|file| file.path().as_ref())
+            .unwrap_or(Path::new("untitled"))
            .into();

        // Replace the buffer in the multibuffer with the snapshot
@@ -346,7 +348,7 @@ impl PendingDiff {
 }

 pub struct FinalizedDiff {
-    path: String,
+    path: PathBuf,
    base_text: Arc<String>,
    new_buffer: Entity<Buffer>,
    multibuffer: Entity<MultiBuffer>,
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -126,39 +126,6 @@ impl MentionUri {
                        abs_path: None,
                        line_range,
                    })
-                } else if let Some(name) = path.strip_prefix("/agent/symbol/") {
-                    let fragment = url
-                        .fragment()
-                        .context("Missing fragment for untitled buffer selection")?;
-                    let line_range = parse_line_range(fragment)?;
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for symbol")?;
-                    Ok(Self::Symbol {
-                        name: name.to_string(),
-                        abs_path: path.into(),
-                        line_range,
-                    })
-                } else if path.starts_with("/agent/file") {
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for file")?;
-                    Ok(Self::File {
-                        abs_path: path.into(),
-                    })
-                } else if path.starts_with("/agent/directory") {
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for directory")?;
-                    Ok(Self::Directory {
-                        abs_path: path.into(),
-                    })
-                } else if path.starts_with("/agent/selection") {
-                    let fragment = url.fragment().context("Missing fragment for selection")?;
-                    let line_range = parse_line_range(fragment)?;
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for selection")?;
-                    Ok(Self::Selection {
-                        abs_path: Some(path.into()),
-                        line_range,
-                    })
                } else {
                    bail!("invalid zed url: {:?}", input);
                }
@@ -213,29 +180,20 @@ impl MentionUri {
    pub fn to_uri(&self) -> Url {
        match self {
            MentionUri::File { abs_path } => {
-                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path("/agent/file");
-                url.query_pairs_mut()
-                    .append_pair("path", &abs_path.to_string_lossy());
-                url
+                Url::from_file_path(abs_path).expect("mention path should be absolute")
            }
            MentionUri::PastedImage => Url::parse("zed:///agent/pasted-image").unwrap(),
            MentionUri::Directory { abs_path } => {
-                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path("/agent/directory");
-                url.query_pairs_mut()
-                    .append_pair("path", &abs_path.to_string_lossy());
-                url
+                Url::from_directory_path(abs_path).expect("mention path should be absolute")
            }
            MentionUri::Symbol {
                abs_path,
                name,
                line_range,
            } => {
-                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path(&format!("/agent/symbol/{name}"));
-                url.query_pairs_mut()
-                    .append_pair("path", &abs_path.to_string_lossy());
+                let mut url =
+                    Url::from_file_path(abs_path).expect("mention path should be absolute");
+                url.query_pairs_mut().append_pair("symbol", name);
                url.set_fragment(Some(&format!(
                    "L{}:{}",
                    line_range.start() + 1,
@@ -244,16 +202,15 @@ impl MentionUri {
                url
            }
            MentionUri::Selection {
-                abs_path,
+                abs_path: path,
                line_range,
            } => {
-                let mut url = Url::parse("zed:///").unwrap();
-                if let Some(abs_path) = abs_path {
-                    url.set_path("/agent/selection");
-                    url.query_pairs_mut()
-                        .append_pair("path", &abs_path.to_string_lossy());
+                let mut url = if let Some(path) = path {
+                    Url::from_file_path(path).expect("mention path should be absolute")
                } else {
+                    let mut url = Url::parse("zed:///").unwrap();
                    url.set_path("/agent/untitled-buffer");
+                    url
                };
                url.set_fragment(Some(&format!(
                    "L{}:{}",
@@ -338,32 +295,37 @@ mod tests {

    #[test]
    fn test_parse_file_uri() {
-        let old_uri = uri!("file:///path/to/file.rs");
-        let parsed = MentionUri::parse(old_uri).unwrap();
+        let file_uri = uri!("file:///path/to/file.rs");
+        let parsed = MentionUri::parse(file_uri).unwrap();
        match &parsed {
            MentionUri::File { abs_path } => {
                assert_eq!(abs_path.to_str().unwrap(), path!("/path/to/file.rs"));
            }
            _ => panic!("Expected File variant"),
        }
-        let new_uri = parsed.to_uri().to_string();
-        assert!(new_uri.starts_with("zed:///agent/file"));
-        assert_eq!(MentionUri::parse(&new_uri).unwrap(), parsed);
+        assert_eq!(parsed.to_uri().to_string(), file_uri);
    }

    #[test]
    fn test_parse_directory_uri() {
-        let old_uri = uri!("file:///path/to/dir/");
-        let parsed = MentionUri::parse(old_uri).unwrap();
+        let file_uri = uri!("file:///path/to/dir/");
+        let parsed = MentionUri::parse(file_uri).unwrap();
        match &parsed {
            MentionUri::Directory { abs_path } => {
                assert_eq!(abs_path.to_str().unwrap(), path!("/path/to/dir/"));
            }
            _ => panic!("Expected Directory variant"),
        }
-        let new_uri = parsed.to_uri().to_string();
-        assert!(new_uri.starts_with("zed:///agent/directory"));
-        assert_eq!(MentionUri::parse(&new_uri).unwrap(), parsed);
+        assert_eq!(parsed.to_uri().to_string(), file_uri);
+    }
+
+    #[test]
+    fn test_to_directory_uri_with_slash() {
+        let uri = MentionUri::Directory {
+            abs_path: PathBuf::from(path!("/path/to/dir/")),
+        };
+        let expected = uri!("file:///path/to/dir/");
+        assert_eq!(uri.to_uri().to_string(), expected);
    }

    #[test]
@@ -371,15 +333,14 @@ mod tests {
        let uri = MentionUri::Directory {
            abs_path: PathBuf::from(path!("/path/to/dir")),
        };
-        let uri_string = uri.to_uri().to_string();
-        assert!(uri_string.starts_with("zed:///agent/directory"));
-        assert_eq!(MentionUri::parse(&uri_string).unwrap(), uri);
+        let expected = uri!("file:///path/to/dir/");
+        assert_eq!(uri.to_uri().to_string(), expected);
    }

    #[test]
    fn test_parse_symbol_uri() {
-        let old_uri = uri!("file:///path/to/file.rs?symbol=MySymbol#L10:20");
-        let parsed = MentionUri::parse(old_uri).unwrap();
+        let symbol_uri = uri!("file:///path/to/file.rs?symbol=MySymbol#L10:20");
+        let parsed = MentionUri::parse(symbol_uri).unwrap();
        match &parsed {
            MentionUri::Symbol {
                abs_path: path,
@@ -393,15 +354,13 @@ mod tests {
            }
            _ => panic!("Expected Symbol variant"),
        }
-        let new_uri = parsed.to_uri().to_string();
-        assert!(new_uri.starts_with("zed:///agent/symbol/MySymbol"));
-        assert_eq!(MentionUri::parse(&new_uri).unwrap(), parsed);
+        assert_eq!(parsed.to_uri().to_string(), symbol_uri);
    }

    #[test]
    fn test_parse_selection_uri() {
-        let old_uri = uri!("file:///path/to/file.rs#L5:15");
-        let parsed = MentionUri::parse(old_uri).unwrap();
+        let selection_uri = uri!("file:///path/to/file.rs#L5:15");
+        let parsed = MentionUri::parse(selection_uri).unwrap();
        match &parsed {
            MentionUri::Selection {
                abs_path: path,
@@ -416,9 +375,7 @@ mod tests {
            }
            _ => panic!("Expected Selection variant"),
        }
-        let new_uri = parsed.to_uri().to_string();
-        assert!(new_uri.starts_with("zed:///agent/selection"));
-        assert_eq!(MentionUri::parse(&new_uri).unwrap(), parsed);
+        assert_eq!(parsed.to_uri().to_string(), selection_uri);
    }

    #[test]
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -8,7 +8,10 @@ use language::{Anchor, Buffer, BufferEvent, DiskState, Point, ToPoint};
 use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
 use std::{cmp, ops::Range, sync::Arc};
 use text::{Edit, Patch, Rope};
-use util::{RangeExt, ResultExt as _};
+use util::{
+    RangeExt, ResultExt as _,
+    paths::{PathStyle, RemotePathBuf},
+};

 /// Tracks actions performed by tools in a thread
 pub struct ActionLog {
@@ -59,13 +62,7 @@ impl ActionLog {
                let file_path = buffer
                    .read(cx)
                    .file()
-                    .map(|file| {
-                        let mut path = file.full_path(cx).to_string_lossy().into_owned();
-                        if file.path_style(cx).is_windows() {
-                            path = path.replace('\\', "/");
-                        }
-                        path
-                    })
+                    .map(|file| RemotePathBuf::new(file.full_path(cx), PathStyle::Posix).to_proto())
                    .unwrap_or_else(|| format!("buffer_{}", buffer.entity_id()));

                let mut result = String::new();
@@ -2304,7 +2301,7 @@ mod tests {
        .await;
        fs.set_head_for_repo(
            path!("/project/.git").as_ref(),
-            &[("file.txt", "a\nb\nc\nd\ne\nf\ng\nh\ni\nj".into())],
+            &[("file.txt".into(), "a\nb\nc\nd\ne\nf\ng\nh\ni\nj".into())],
            "0000000",
        );
        cx.run_until_parked();
@@ -2387,7 +2384,7 @@ mod tests {
        // - Ignores the last line edit (j stays as j)
        fs.set_head_for_repo(
            path!("/project/.git").as_ref(),
-            &[("file.txt", "A\nb\nc\nf\nG\nh\ni\nj".into())],
+            &[("file.txt".into(), "A\nb\nc\nf\nG\nh\ni\nj".into())],
            "0000001",
        );
        cx.run_until_parked();
@@ -2418,7 +2415,10 @@ mod tests {
        // Make another commit that accepts the NEW line but with different content
        fs.set_head_for_repo(
            path!("/project/.git").as_ref(),
-            &[("file.txt", "A\nb\nc\nf\nGGG\nh\nDIFFERENT\ni\nj".into())],
+            &[(
+                "file.txt".into(),
+                "A\nb\nc\nf\nGGG\nh\nDIFFERENT\ni\nj".into(),
+            )],
            "0000002",
        );
        cx.run_until_parked();
@@ -2444,7 +2444,7 @@ mod tests {
        // Final commit that accepts all remaining edits
        fs.set_head_for_repo(
            path!("/project/.git").as_ref(),
-            &[("file.txt", "A\nb\nc\nf\nGGG\nh\nNEW\ni\nJ".into())],
+            &[("file.txt".into(), "A\nb\nc\nf\nGGG\nh\nNEW\ni\nJ".into())],
            "0000003",
        );
        cx.run_until_parked();
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -9,14 +9,12 @@ pub mod tool_use;

 pub use context::{AgentContext, ContextId, ContextLoadResult};
 pub use context_store::ContextStore;
-use fs::Fs;
-use std::sync::Arc;
 pub use thread::{
    LastRestoreCheckpoint, Message, MessageCrease, MessageId, MessageSegment, Thread, ThreadError,
    ThreadEvent, ThreadFeedback, ThreadId, ThreadSummary, TokenUsageRatio,
 };
 pub use thread_store::{SerializedThread, TextThreadStore, ThreadStore};

-pub fn init(fs: Arc<dyn Fs>, cx: &mut gpui::App) {
-    thread_store::init(fs, cx);
+pub fn init(cx: &mut gpui::App) {
+    thread_store::init(cx);
 }
--- a/crates/agent/src/agent_profile.rs
+++ b/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();
            }
        });

--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -18,7 +18,6 @@ use std::path::PathBuf;
 use std::{ops::Range, path::Path, sync::Arc};
 use text::{Anchor, OffsetRangeExt as _};
 use util::markdown::MarkdownCodeBlock;
-use util::rel_path::RelPath;
 use util::{ResultExt as _, post_inc};

 pub const RULES_ICON: IconName = IconName::Reader;
@@ -159,7 +158,7 @@ pub struct FileContextHandle {
 #[derive(Debug, Clone)]
 pub struct FileContext {
    pub handle: FileContextHandle,
-    pub full_path: String,
+    pub full_path: Arc<Path>,
    pub text: SharedString,
    pub is_outline: bool,
 }
@@ -187,7 +186,7 @@ impl FileContextHandle {
            log::error!("file context missing path");
            return Task::ready(None);
        };
-        let full_path = file.full_path(cx).to_string_lossy().into_owned();
+        let full_path: Arc<Path> = file.full_path(cx).into();
        let rope = buffer_ref.as_rope().clone();
        let buffer = self.buffer.clone();

@@ -236,14 +235,14 @@ pub struct DirectoryContextHandle {
 #[derive(Debug, Clone)]
 pub struct DirectoryContext {
    pub handle: DirectoryContextHandle,
-    pub full_path: String,
+    pub full_path: Arc<Path>,
    pub descendants: Vec<DirectoryContextDescendant>,
 }

 #[derive(Debug, Clone)]
 pub struct DirectoryContextDescendant {
    /// Path within the directory.
-    pub rel_path: Arc<RelPath>,
+    pub rel_path: Arc<Path>,
    pub fenced_codeblock: SharedString,
 }

@@ -274,16 +273,13 @@ impl DirectoryContextHandle {
        }

        let directory_path = entry.path.clone();
-        let directory_full_path = worktree_ref
-            .full_path(&directory_path)
-            .to_string_lossy()
-            .to_string();
+        let directory_full_path = worktree_ref.full_path(&directory_path).into();

        let file_paths = collect_files_in_path(worktree_ref, &directory_path);
        let descendants_future = future::join_all(file_paths.into_iter().map(|path| {
            let worktree_ref = worktree.read(cx);
            let worktree_id = worktree_ref.id();
-            let full_path = worktree_ref.full_path(&path).to_string_lossy().into_owned();
+            let full_path = worktree_ref.full_path(&path);

            let rel_path = path
                .strip_prefix(&directory_path)
@@ -364,7 +360,7 @@ pub struct SymbolContextHandle {
 #[derive(Debug, Clone)]
 pub struct SymbolContext {
    pub handle: SymbolContextHandle,
-    pub full_path: String,
+    pub full_path: Arc<Path>,
    pub line_range: Range<Point>,
    pub text: SharedString,
 }
@@ -403,7 +399,7 @@ impl SymbolContextHandle {
            log::error!("symbol context's file has no path");
            return Task::ready(None);
        };
-        let full_path = file.full_path(cx).to_string_lossy().into_owned();
+        let full_path = file.full_path(cx).into();
        let line_range = self.enclosing_range.to_point(&buffer_ref.snapshot());
        let text = self.text(cx);
        let buffer = self.buffer.clone();
@@ -437,7 +433,7 @@ pub struct SelectionContextHandle {
 #[derive(Debug, Clone)]
 pub struct SelectionContext {
    pub handle: SelectionContextHandle,
-    pub full_path: String,
+    pub full_path: Arc<Path>,
    pub line_range: Range<Point>,
    pub text: SharedString,
 }
@@ -476,7 +472,7 @@ impl SelectionContextHandle {
        let text = self.text(cx);
        let buffer = self.buffer.clone();
        let context = AgentContext::Selection(SelectionContext {
-            full_path: full_path.to_string_lossy().into_owned(),
+            full_path: full_path.into(),
            line_range: self.line_range(cx),
            text,
            handle: self,
@@ -706,7 +702,7 @@ impl Display for RulesContext {
 #[derive(Debug, Clone)]
 pub struct ImageContext {
    pub project_path: Option<ProjectPath>,
-    pub full_path: Option<String>,
+    pub full_path: Option<Arc<Path>>,
    pub original_image: Arc<gpui::Image>,
    // TODO: handle this elsewhere and remove `ignore-interior-mutability` opt-out in clippy.toml
    // needed due to a false positive of `clippy::mutable_key_type`.
@@ -972,7 +968,7 @@ pub fn load_context(
    })
 }

-fn collect_files_in_path(worktree: &Worktree, path: &RelPath) -> Vec<Arc<RelPath>> {
+fn collect_files_in_path(worktree: &Worktree, path: &Path) -> Vec<Arc<Path>> {
    let mut files = Vec::new();

    for entry in worktree.child_entries(path) {
@@ -986,17 +982,14 @@ fn collect_files_in_path(worktree: &Worktree, path: &RelPath) -> Vec<Arc<RelPath
    files
 }

-fn codeblock_tag(full_path: &str, line_range: Option<Range<Point>>) -> String {
+fn codeblock_tag(full_path: &Path, line_range: Option<Range<Point>>) -> String {
    let mut result = String::new();

-    if let Some(extension) = Path::new(full_path)
-        .extension()
-        .and_then(|ext| ext.to_str())
-    {
+    if let Some(extension) = full_path.extension().and_then(|ext| ext.to_str()) {
        let _ = write!(result, "{} ", extension);
    }

-    let _ = write!(result, "{}", full_path);
+    let _ = write!(result, "{}", full_path.display());

    if let Some(range) = line_range {
        if range.start.row == range.end.row {
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -14,10 +14,7 @@ use futures::{self, FutureExt};
 use gpui::{App, Context, Entity, EventEmitter, Image, SharedString, Task, WeakEntity};
 use language::{Buffer, File as _};
 use language_model::LanguageModelImage;
-use project::{
-    Project, ProjectItem, ProjectPath, Symbol, image_store::is_image_file,
-    lsp_store::SymbolLocation,
-};
+use project::{Project, ProjectItem, ProjectPath, Symbol, image_store::is_image_file};
 use prompt_store::UserPromptId;
 use ref_cast::RefCast as _;
 use std::{
@@ -312,7 +309,7 @@ impl ContextStore {
                let item = image_item.read(cx);
                this.insert_image(
                    Some(item.project_path(cx)),
-                    Some(item.file.full_path(cx).to_string_lossy().into_owned()),
+                    Some(item.file.full_path(cx).into()),
                    item.image.clone(),
                    remove_if_exists,
                    cx,
@@ -328,7 +325,7 @@ impl ContextStore {
    fn insert_image(
        &mut self,
        project_path: Option<ProjectPath>,
-        full_path: Option<String>,
+        full_path: Option<Arc<Path>>,
        image: Arc<Image>,
        remove_if_exists: bool,
        cx: &mut Context<ContextStore>,
@@ -503,7 +500,7 @@ impl ContextStore {
                let Some(context_path) = buffer.project_path(cx) else {
                    return false;
                };
-                if symbol.path != SymbolLocation::InProject(context_path) {
+                if context_path != symbol.path {
                    return false;
                }
                let context_range = context.range.to_point_utf16(&buffer.snapshot());
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -155,7 +155,7 @@ impl HistoryStore {
            .iter()
            .filter_map(|entry| match entry {
                HistoryEntryId::Context(path) => path.file_name().map(|file| {
-                    SerializedRecentOpen::ContextName(file.to_string_lossy().into_owned())
+                    SerializedRecentOpen::ContextName(file.to_string_lossy().to_string())
                }),
                HistoryEntryId::Thread(id) => Some(SerializedRecentOpen::Thread(id.to_string())),
            })
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -234,6 +234,7 @@ impl MessageSegment {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct ProjectSnapshot {
    pub worktree_snapshots: Vec<WorktreeSnapshot>,
+    pub unsaved_buffer_paths: Vec<String>,
    pub timestamp: DateTime<Utc>,
 }

@@ -2856,11 +2857,27 @@ impl Thread {
            .map(|worktree| Self::worktree_snapshot(worktree, git_store.clone(), cx))
            .collect();

-        cx.spawn(async move |_, _| {
+        cx.spawn(async move |_, cx| {
            let worktree_snapshots = futures::future::join_all(worktree_snapshots).await;

+            let mut unsaved_buffers = Vec::new();
+            cx.update(|app_cx| {
+                let buffer_store = project.read(app_cx).buffer_store();
+                for buffer_handle in buffer_store.read(app_cx).buffers() {
+                    let buffer = buffer_handle.read(app_cx);
+                    if buffer.is_dirty()
+                        && let Some(file) = buffer.file()
+                    {
+                        let path = file.path().to_string_lossy().to_string();
+                        unsaved_buffers.push(path);
+                    }
+                }
+            })
+            .ok();
+
            Arc::new(ProjectSnapshot {
                worktree_snapshots,
+                unsaved_buffer_paths: unsaved_buffers,
                timestamp: Utc::now(),
            })
        })
@@ -2875,7 +2892,7 @@ impl Thread {
            // Get worktree path and snapshot
            let worktree_info = cx.update(|app_cx| {
                let worktree = worktree.read(app_cx);
-                let path = worktree.abs_path().to_string_lossy().into_owned();
+                let path = worktree.abs_path().to_string_lossy().to_string();
                let snapshot = worktree.snapshot();
                (path, snapshot)
            });
@@ -3255,10 +3272,9 @@ 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 fs::Fs;
    use futures::StreamExt;
    use futures::future::BoxFuture;
    use futures::stream::BoxStream;
@@ -3273,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;
@@ -3282,10 +3298,9 @@ mod tests {

    #[gpui::test]
    async fn test_message_with_context(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

        let project = create_test_project(
-            &fs,
            cx,
            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
        )
@@ -3360,10 +3375,9 @@ fn main() {{

    #[gpui::test]
    async fn test_only_include_new_contexts(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

        let project = create_test_project(
-            &fs,
            cx,
            json!({
                "file1.rs": "fn function1() {}\n",
@@ -3517,10 +3531,9 @@ fn main() {{

    #[gpui::test]
    async fn test_message_without_files(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

        let project = create_test_project(
-            &fs,
            cx,
            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
        )
@@ -3597,10 +3610,9 @@ fn main() {{
    #[gpui::test]
    #[ignore] // turn this test on when project_notifications tool is re-enabled
    async fn test_stale_buffer_notification(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

        let project = create_test_project(
-            &fs,
            cx,
            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
        )
@@ -3726,10 +3738,9 @@ fn main() {{

    #[gpui::test]
    async fn test_storing_profile_setting_per_thread(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

        let project = create_test_project(
-            &fs,
            cx,
            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
        )
@@ -3749,10 +3760,9 @@ fn main() {{

    #[gpui::test]
    async fn test_serializing_thread_profile(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

        let project = create_test_project(
-            &fs,
            cx,
            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
        )
@@ -3793,10 +3803,9 @@ fn main() {{

    #[gpui::test]
    async fn test_temperature_setting(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

        let project = create_test_project(
-            &fs,
            cx,
            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
        )
@@ -3888,9 +3897,9 @@ fn main() {{

    #[gpui::test]
    async fn test_thread_summary(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;

        let (_, _thread_store, thread, _context_store, model) =
            setup_test_environment(cx, project.clone()).await;
@@ -3973,9 +3982,9 @@ fn main() {{

    #[gpui::test]
    async fn test_thread_summary_error_set_manually(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;

        let (_, _thread_store, thread, _context_store, model) =
            setup_test_environment(cx, project.clone()).await;
@@ -3995,9 +4004,9 @@ fn main() {{

    #[gpui::test]
    async fn test_thread_summary_error_retry(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;

        let (_, _thread_store, thread, _context_store, model) =
            setup_test_environment(cx, project.clone()).await;
@@ -4149,9 +4158,9 @@ fn main() {{

    #[gpui::test]
    async fn test_retry_on_overloaded_error(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -4227,9 +4236,9 @@ fn main() {{

    #[gpui::test]
    async fn test_retry_on_internal_server_error(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -4309,9 +4318,9 @@ fn main() {{

    #[gpui::test]
    async fn test_exponential_backoff_on_retries(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -4429,9 +4438,9 @@ fn main() {{

    #[gpui::test]
    async fn test_max_retries_exceeded(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -4520,9 +4529,9 @@ fn main() {{

    #[gpui::test]
    async fn test_retry_message_removed_on_retry(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -4693,9 +4702,9 @@ fn main() {{

    #[gpui::test]
    async fn test_successful_completion_clears_retry_state(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -4859,9 +4868,9 @@ fn main() {{

    #[gpui::test]
    async fn test_rate_limit_retry_single_attempt(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -5044,9 +5053,9 @@ fn main() {{

    #[gpui::test]
    async fn test_ui_only_messages_not_sent_to_model(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, model) = setup_test_environment(cx, project.clone()).await;

        // Insert a regular user message
@@ -5144,9 +5153,9 @@ fn main() {{

    #[gpui::test]
    async fn test_no_retry_without_burn_mode(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Ensure we're in Normal mode (not Burn mode)
@@ -5217,9 +5226,9 @@ fn main() {{

    #[gpui::test]
    async fn test_retry_canceled_on_stop(cx: &mut TestAppContext) {
-        let fs = init_test_settings(cx);
+        init_test_settings(cx);

-        let project = create_test_project(&fs, cx, json!({})).await;
+        let project = create_test_project(cx, json!({})).await;
        let (_, _, thread, _, _base_model) = setup_test_environment(cx, project.clone()).await;

        // Enable Burn Mode to allow retries
@@ -5325,8 +5334,7 @@ fn main() {{
        cx.run_until_parked();
    }

-    fn init_test_settings(cx: &mut TestAppContext) -> Arc<dyn Fs> {
-        let fs = FakeFs::new(cx.executor());
+    fn init_test_settings(cx: &mut TestAppContext) {
        cx.update(|cx| {
            let settings_store = SettingsStore::test(cx);
            cx.set_global(settings_store);
@@ -5334,7 +5342,7 @@ fn main() {{
            Project::init_settings(cx);
            AgentSettings::register(cx);
            prompt_store::init(cx);
-            thread_store::init(fs.clone(), cx);
+            thread_store::init(cx);
            workspace::init_settings(cx);
            language_model::init_settings(cx);
            ThemeSettings::register(cx);
@@ -5348,17 +5356,16 @@ fn main() {{
            ));
            assistant_tools::init(http_client, cx);
        });
-        fs
    }

    // Helper to create a test project with test files
    async fn create_test_project(
-        fs: &Arc<dyn Fs>,
        cx: &mut TestAppContext,
        files: serde_json::Value,
    ) -> Entity<Project> {
-        fs.as_fake().insert_tree(path!("/test"), files).await;
-        Project::test(fs.clone(), [path!("/test").as_ref()], cx).await
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/test"), files).await;
+        Project::test(fs, [path!("/test").as_ref()], cx).await
    }

    async fn setup_test_environment(
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -10,7 +10,6 @@ use assistant_tool::{Tool, ToolId, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
 use context_server::ContextServerId;
-use fs::{Fs, RemoveOptions};
 use futures::{
    FutureExt as _, StreamExt as _,
    channel::{mpsc, oneshot},
@@ -40,7 +39,7 @@ use std::{
    rc::Rc,
    sync::{Arc, Mutex},
 };
-use util::{ResultExt as _, rel_path::RelPath};
+use util::ResultExt as _;

 use zed_env_vars::ZED_STATELESS;

@@ -86,8 +85,8 @@ const RULES_FILE_NAMES: [&str; 9] = [
    "GEMINI.md",
 ];

-pub fn init(fs: Arc<dyn Fs>, cx: &mut App) {
-    ThreadsDatabase::init(fs, cx);
+pub fn init(cx: &mut App) {
+    ThreadsDatabase::init(cx);
 }

 /// A system prompt shared by all threads created by this ThreadStore
@@ -235,7 +234,7 @@ impl ThreadStore {
                if items.iter().any(|(path, _, _)| {
                    RULES_FILE_NAMES
                        .iter()
-                        .any(|name| path.as_ref() == RelPath::unix(name).unwrap())
+                        .any(|name| path.as_ref() == Path::new(name))
                }) {
                    self.enqueue_system_prompt_reload();
                }
@@ -328,7 +327,7 @@ impl ThreadStore {
        cx: &mut App,
    ) -> Task<(WorktreeContext, Option<RulesLoadingError>)> {
        let tree = worktree.read(cx);
-        let root_name = tree.root_name_str().into();
+        let root_name = tree.root_name().into();
        let abs_path = tree.abs_path();

        let mut context = WorktreeContext {
@@ -368,7 +367,7 @@ impl ThreadStore {
            .into_iter()
            .filter_map(|name| {
                worktree
-                    .entry_for_path(RelPath::unix(name).unwrap())
+                    .entry_for_path(name)
                    .filter(|entry| entry.is_file())
                    .map(|entry| entry.path.clone())
            })
@@ -870,13 +869,13 @@ impl ThreadsDatabase {
        GlobalThreadsDatabase::global(cx).0.clone()
    }

-    fn init(fs: Arc<dyn Fs>, cx: &mut App) {
+    fn init(cx: &mut App) {
        let executor = cx.background_executor().clone();
        let database_future = executor
            .spawn({
                let executor = executor.clone();
                let threads_dir = paths::data_dir().join("threads");
-                async move { ThreadsDatabase::new(fs, threads_dir, executor).await }
+                async move { ThreadsDatabase::new(threads_dir, executor) }
            })
            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
            .boxed()
@@ -885,17 +884,13 @@ impl ThreadsDatabase {
        cx.set_global(GlobalThreadsDatabase(database_future));
    }

-    pub async fn new(
-        fs: Arc<dyn Fs>,
-        threads_dir: PathBuf,
-        executor: BackgroundExecutor,
-    ) -> Result<Self> {
-        fs.create_dir(&threads_dir).await?;
+    pub fn new(threads_dir: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
+        std::fs::create_dir_all(&threads_dir)?;

        let sqlite_path = threads_dir.join("threads.db");
        let mdb_path = threads_dir.join("threads-db.1.mdb");

-        let needs_migration_from_heed = fs.is_file(&mdb_path).await;
+        let needs_migration_from_heed = mdb_path.exists();

        let connection = if *ZED_STATELESS {
            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
@@ -937,14 +932,7 @@ impl ThreadsDatabase {
                .spawn(async move {
                    log::info!("Starting threads.db migration");
                    Self::migrate_from_heed(&mdb_path, db_connection, executor_clone)?;
-                    fs.remove_dir(
-                        &mdb_path,
-                        RemoveOptions {
-                            recursive: true,
-                            ignore_if_not_exists: true,
-                        },
-                    )
-                    .await?;
+                    std::fs::remove_dir_all(mdb_path)?;
                    log::info!("threads.db migrated to sqlite");
                    Ok::<(), anyhow::Error>(())
                })
--- a/crates/agent2/src/agent.rs
+++ b/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,14 +21,13 @@ 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};
 use std::rc::Rc;
 use std::sync::Arc;
 use util::ResultExt;
-use util::rel_path::RelPath;

 const RULES_FILE_NAMES: [&str; 9] = [
    ".rules",
@@ -57,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<()>,
@@ -133,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()
    }

@@ -144,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<()> {
@@ -435,7 +437,7 @@ impl NativeAgent {
        cx: &mut App,
    ) -> Task<(WorktreeContext, Option<RulesLoadingError>)> {
        let tree = worktree.read(cx);
-        let root_name = tree.root_name_str().into();
+        let root_name = tree.root_name().into();
        let abs_path = tree.abs_path();

        let mut context = WorktreeContext {
@@ -475,7 +477,7 @@ impl NativeAgent {
            .into_iter()
            .filter_map(|name| {
                worktree
-                    .entry_for_path(RelPath::unix(name).unwrap())
+                    .entry_for_path(name)
                    .filter(|entry| entry.is_file())
                    .map(|entry| entry.path.clone())
            })
@@ -559,7 +561,7 @@ impl NativeAgent {
                if items.iter().any(|(path, _, _)| {
                    RULES_FILE_NAMES
                        .iter()
-                        .any(|name| path.as_ref() == RelPath::unix(name).unwrap())
+                        .any(|name| path.as_ref() == Path::new(name))
                }) {
                    self.project_context_needs_refresh.send(()).ok();
                }
@@ -835,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 {
@@ -851,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)));
        };

@@ -876,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")));
@@ -918,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()
    }
 }

@@ -975,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(
@@ -1202,14 +1193,16 @@ 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::formatdoc;
+    use indoc::indoc;
    use language_model::fake_provider::FakeLanguageModel;
    use serde_json::json;
    use settings::SettingsStore;
-    use util::{path, rel_path::rel_path};
+    use util::path;

    #[gpui::test]
    async fn test_maintaining_project_context(cx: &mut TestAppContext) {
@@ -1259,17 +1252,14 @@ mod tests {
        fs.insert_file("/a/.rules", Vec::new()).await;
        cx.run_until_parked();
        agent.read_with(cx, |agent, cx| {
-            let rules_entry = worktree
-                .read(cx)
-                .entry_for_path(rel_path(".rules"))
-                .unwrap();
+            let rules_entry = worktree.read(cx).entry_for_path(".rules").unwrap();
            assert_eq!(
                agent.project_context.read(cx).worktrees,
                vec![WorktreeContext {
                    root_name: "a".into(),
                    abs_path: Path::new("/a").into(),
                    rules_file: Some(RulesFileContext {
-                        path_in_worktree: rel_path(".rules").into(),
+                        path_in_worktree: Path::new(".rules").into(),
                        text: "".into(),
                        project_entry_id: rules_entry.id.to_usize()
                    })
@@ -1299,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");
@@ -1327,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),
                }]
            )])
@@ -1386,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();

@@ -1502,17 +1472,13 @@ mod tests {
        summary_model.end_last_completion_stream();

        send.await.unwrap();
-        let uri = MentionUri::File {
-            abs_path: path!("/a/b.md").into(),
-        }
-        .to_uri();
        acp_thread.read_with(cx, |thread, cx| {
            assert_eq!(
                thread.to_markdown(cx),
-                formatdoc! {"
+                indoc! {"
                    ## User

-                    What does [@b.md]({uri}) mean?
+                    What does [@b.md](file:///a/b.md) mean?

                    ## Assistant

@@ -1548,10 +1514,10 @@ mod tests {
        acp_thread.read_with(cx, |thread, cx| {
            assert_eq!(
                thread.to_markdown(cx),
-                formatdoc! {"
+                indoc! {"
                    ## User

-                    What does [@b.md]({uri}) mean?
+                    What does [@b.md](file:///a/b.md) mean?

                    ## Assistant

--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -422,15 +422,17 @@ mod tests {
    use agent::MessageSegment;
    use agent::context::LoadedContext;
    use client::Client;
-    use fs::{FakeFs, Fs};
+    use fs::FakeFs;
    use gpui::AppContext;
    use gpui::TestAppContext;
    use http_client::FakeHttpClient;
    use language_model::Role;
    use project::Project;
+    use serde_json::json;
    use settings::SettingsStore;
+    use util::test::TempTree;

-    fn init_test(fs: Arc<dyn Fs>, cx: &mut TestAppContext) {
+    fn init_test(cx: &mut TestAppContext) {
        env_logger::try_init().ok();
        cx.update(|cx| {
            let settings_store = SettingsStore::test(cx);
@@ -441,7 +443,7 @@ mod tests {
            let http_client = FakeHttpClient::with_404_response();
            let clock = Arc::new(clock::FakeSystemClock::new());
            let client = Client::new(clock, http_client, cx);
-            agent::init(fs, cx);
+            agent::init(cx);
            agent_settings::init(cx);
            language_model::init(client, cx);
        });
@@ -449,8 +451,10 @@ mod tests {

    #[gpui::test]
    async fn test_retrieving_old_thread(cx: &mut TestAppContext) {
+        let tree = TempTree::new(json!({}));
+        util::paths::set_home_dir(tree.path().into());
+        init_test(cx);
        let fs = FakeFs::new(cx.executor());
-        init_test(fs.clone(), cx);
        let project = Project::test(fs, [], cx).await;

        // Save a thread using the old agent.
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -262,7 +262,7 @@ impl HistoryStore {
            .iter()
            .filter_map(|entry| match entry {
                HistoryEntryId::TextThread(path) => path.file_name().map(|file| {
-                    SerializedRecentOpen::TextThread(file.to_string_lossy().into_owned())
+                    SerializedRecentOpen::TextThread(file.to_string_lossy().to_string())
                }),
                HistoryEntryId::AcpThread(id) => {
                    Some(SerializedRecentOpen::AcpThread(id.to_string()))
--- a/crates/agent2/src/templates/system_prompt.hbs
+++ b/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
--- a/crates/agent2/src/tests/mod.rs
+++ b/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
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -879,11 +879,27 @@ impl Thread {
            .map(|worktree| Self::worktree_snapshot(worktree, git_store.clone(), cx))
            .collect();

-        cx.spawn(async move |_, _| {
+        cx.spawn(async move |_, cx| {
            let worktree_snapshots = futures::future::join_all(worktree_snapshots).await;

+            let mut unsaved_buffers = Vec::new();
+            cx.update(|app_cx| {
+                let buffer_store = project.read(app_cx).buffer_store();
+                for buffer_handle in buffer_store.read(app_cx).buffers() {
+                    let buffer = buffer_handle.read(app_cx);
+                    if buffer.is_dirty()
+                        && let Some(file) = buffer.file()
+                    {
+                        let path = file.path().to_string_lossy().to_string();
+                        unsaved_buffers.push(path);
+                    }
+                }
+            })
+            .ok();
+
            Arc::new(ProjectSnapshot {
                worktree_snapshots,
+                unsaved_buffer_paths: unsaved_buffers,
                timestamp: Utc::now(),
            })
        })
@@ -898,7 +914,7 @@ impl Thread {
            // Get worktree path and snapshot
            let worktree_info = cx.update(|app_cx| {
                let worktree = worktree.read(app_cx);
-                let path = worktree.abs_path().to_string_lossy().into_owned();
+                let path = worktree.abs_path().to_string_lossy().to_string();
                let snapshot = worktree.snapshot();
                (path, snapshot)
            });
@@ -2461,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);
                        });
                    })?;
                }
--- a/crates/agent2/src/tools/copy_path_tool.rs
+++ b/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:
@@ -84,7 +84,9 @@ impl AgentTool for CopyPathTool {
                .and_then(|project_path| project.entry_for_path(&project_path, cx))
            {
                Some(entity) => match project.find_project_path(&input.destination_path, cx) {
-                    Some(project_path) => project.copy_entry(entity.id, project_path, cx),
+                    Some(project_path) => {
+                        project.copy_entry(entity.id, None, project_path.path, cx)
+                    }
                    None => Task::ready(Err(anyhow!(
                        "Destination path {} was outside the project.",
                        input.destination_path
--- a/crates/agent2/src/tools/create_directory_tool.rs
+++ b/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.
--- a/crates/agent2/src/tools/diagnostics_tool.rs
+++ b/crates/agent2/src/tools/diagnostics_tool.rs
@@ -6,7 +6,7 @@ use language::{DiagnosticSeverity, OffsetRangeExt};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use std::{fmt::Write, sync::Arc};
+use std::{fmt::Write, path::Path, sync::Arc};
 use ui::SharedString;
 use util::markdown::MarkdownInlineCode;

@@ -147,7 +147,9 @@ impl AgentTool for DiagnosticsTool {
                        has_diagnostics = true;
                        output.push_str(&format!(
                            "{}: {} error(s), {} warning(s)\n",
-                            worktree.read(cx).absolutize(&project_path.path).display(),
+                            Path::new(worktree.read(cx).root_name())
+                                .join(project_path.path)
+                                .display(),
                            summary.error_count,
                            summary.warning_count
                        ));
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -17,12 +17,10 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
 use smol::stream::StreamExt as _;
-use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use ui::SharedString;
 use util::ResultExt;
-use util::rel_path::RelPath;

 const DEFAULT_UI_TEXT: &str = "Editing file";

@@ -150,11 +148,12 @@ impl EditFileTool {

        // If any path component matches the local settings folder, then this could affect
        // the editor in ways beyond the project source, so prompt.
-        let local_settings_folder = paths::local_settings_folder_name();
+        let local_settings_folder = paths::local_settings_folder_relative_path();
        let path = Path::new(&input.path);
-        if path.components().any(|component| {
-            component.as_os_str() == <_ as AsRef<OsStr>>::as_ref(&local_settings_folder)
-        }) {
+        if path
+            .components()
+            .any(|component| component.as_os_str() == local_settings_folder.as_os_str())
+        {
            return event_stream.authorize(
                format!("{} (local settings)", input.display_description),
                cx,
@@ -163,7 +162,6 @@ impl EditFileTool {

        // It's also possible that the global config dir is configured to be inside the project,
        // so check for that edge case too.
-        // TODO this is broken when remoting
        if let Ok(canonical_path) = std::fs::canonicalize(&input.path)
            && canonical_path.starts_with(paths::config_dir())
        {
@@ -218,7 +216,9 @@ impl AgentTool for EditFileTool {
                        .read(cx)
                        .short_full_path_for_project_path(&project_path, cx)
                })
-                .unwrap_or(input.path.to_string_lossy().into_owned())
+                .unwrap_or(Path::new(&input.path).into())
+                .to_string_lossy()
+                .to_string()
                .into(),
            Err(raw_input) => {
                if let Some(input) =
@@ -235,7 +235,9 @@ impl AgentTool for EditFileTool {
                                    .read(cx)
                                    .short_full_path_for_project_path(&project_path, cx)
                            })
-                            .unwrap_or(input.path)
+                            .unwrap_or(Path::new(&input.path).into())
+                            .to_string_lossy()
+                            .to_string()
                            .into();
                    }

@@ -476,7 +478,7 @@ impl AgentTool for EditFileTool {
    ) -> Result<()> {
        event_stream.update_diff(cx.new(|cx| {
            Diff::finalized(
-                output.input_path.to_string_lossy().into_owned(),
+                output.input_path,
                Some(output.old_text.to_string()),
                output.new_text,
                self.language_registry.clone(),
@@ -540,12 +542,10 @@ fn resolve_path(
            let file_name = input
                .path
                .file_name()
-                .and_then(|file_name| file_name.to_str())
-                .and_then(|file_name| RelPath::unix(file_name).ok())
                .context("Can't create file: invalid filename")?;

            let new_file_path = parent_project_path.map(|parent| ProjectPath {
-                path: parent.path.join(file_name),
+                path: Arc::from(parent.path.join(file_name)),
                ..parent
            });

@@ -565,7 +565,7 @@ mod tests {
    use prompt_store::ProjectContext;
    use serde_json::json;
    use settings::SettingsStore;
-    use util::{path, rel_path::rel_path};
+    use util::path;

    #[gpui::test]
    async fn test_edit_nonexistent_file(cx: &mut TestAppContext) {
@@ -614,13 +614,13 @@ mod tests {
        let mode = &EditFileMode::Create;

        let result = test_resolve_path(mode, "root/new.txt", cx);
-        assert_resolved_path_eq(result.await, rel_path("new.txt"));
+        assert_resolved_path_eq(result.await, "new.txt");

        let result = test_resolve_path(mode, "new.txt", cx);
-        assert_resolved_path_eq(result.await, rel_path("new.txt"));
+        assert_resolved_path_eq(result.await, "new.txt");

        let result = test_resolve_path(mode, "dir/new.txt", cx);
-        assert_resolved_path_eq(result.await, rel_path("dir/new.txt"));
+        assert_resolved_path_eq(result.await, "dir/new.txt");

        let result = test_resolve_path(mode, "root/dir/subdir/existing.txt", cx);
        assert_eq!(
@@ -642,10 +642,10 @@ mod tests {
        let path_with_root = "root/dir/subdir/existing.txt";
        let path_without_root = "dir/subdir/existing.txt";
        let result = test_resolve_path(mode, path_with_root, cx);
-        assert_resolved_path_eq(result.await, rel_path(path_without_root));
+        assert_resolved_path_eq(result.await, path_without_root);

        let result = test_resolve_path(mode, path_without_root, cx);
-        assert_resolved_path_eq(result.await, rel_path(path_without_root));
+        assert_resolved_path_eq(result.await, path_without_root);

        let result = test_resolve_path(mode, "root/nonexistent.txt", cx);
        assert_eq!(
@@ -690,10 +690,14 @@ mod tests {
        cx.update(|cx| resolve_path(&input, project, cx))
    }

-    #[track_caller]
-    fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &RelPath) {
-        let actual = path.expect("Should return valid path").path;
-        assert_eq!(actual.as_ref(), expected);
+    fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &str) {
+        let actual = path
+            .expect("Should return valid path")
+            .path
+            .to_str()
+            .unwrap()
+            .replace("\\", "/"); // Naive Windows paths normalization
+        assert_eq!(actual, expected);
    }

    #[gpui::test]
@@ -787,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);
+                    },
+                );
            });
        });

@@ -846,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);
+                    },
+                );
            });
        });

@@ -926,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);
+                    },
+                );
            });
        });

@@ -983,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);
+                    },
+                );
            });
        });

@@ -1404,8 +1411,8 @@ mod tests {
            // Parent directory references - find_project_path resolves these
            (
                "project/../other",
-                true,
-                "Path with .. that goes outside of root directory",
+                false,
+                "Path with .. is resolved by find_project_path",
            ),
            (
                "project/./src/file.rs",
@@ -1433,18 +1440,16 @@ mod tests {
                )
            });

-            cx.run_until_parked();
-
            if should_confirm {
                stream_rx.expect_authorization().await;
            } else {
+                auth.await.unwrap();
                assert!(
                    stream_rx.try_next().is_err(),
                    "Failed for case: {} - path: {} - expected no confirmation but got one",
                    description,
                    path
                );
-                auth.await.unwrap();
            }
        }
    }
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -156,14 +156,10 @@ impl AgentTool for FindPathTool {
 }

 fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Result<Vec<PathBuf>>> {
-    let path_style = project.read(cx).path_style(cx);
-    let path_matcher = match PathMatcher::new(
-        [
-            // Sometimes models try to search for "". In this case, return all paths in the project.
-            if glob.is_empty() { "*" } else { glob },
-        ],
-        path_style,
-    ) {
+    let path_matcher = match PathMatcher::new([
+        // Sometimes models try to search for "". In this case, return all paths in the project.
+        if glob.is_empty() { "*" } else { glob },
+    ]) {
        Ok(matcher) => matcher,
        Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {err}"))),
    };
@@ -177,8 +173,9 @@ fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Resu
        let mut results = Vec::new();
        for snapshot in snapshots {
            for entry in snapshot.entries(false, 0) {
-                if path_matcher.is_match(snapshot.root_name().join(&entry.path).as_std_path()) {
-                    results.push(snapshot.absolutize(&entry.path));
+                let root_name = PathBuf::from(snapshot.root_name());
+                if path_matcher.is_match(root_name.join(&entry.path)) {
+                    results.push(snapshot.abs_path().join(entry.path.as_ref()));
                }
            }
        }
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -110,15 +110,12 @@ impl AgentTool for GrepTool {
        const CONTEXT_LINES: u32 = 2;
        const MAX_ANCESTOR_LINES: u32 = 10;

-        let path_style = self.project.read(cx).path_style(cx);
-
        let include_matcher = match PathMatcher::new(
            input
                .include_pattern
                .as_ref()
                .into_iter()
                .collect::<Vec<_>>(),
-            path_style,
        ) {
            Ok(matcher) => matcher,
            Err(error) => {
@@ -135,7 +132,7 @@ impl AgentTool for GrepTool {
                .iter()
                .chain(global_settings.private_files.sources().iter());

-            match PathMatcher::new(exclude_patterns, path_style) {
+            match PathMatcher::new(exclude_patterns) {
                Ok(matcher) => matcher,
                Err(error) => {
                    return Task::ready(Err(anyhow!("invalid exclude pattern: {error}")));
@@ -311,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;
@@ -830,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(),
+                    ]);
                });
            });
        });
@@ -1067,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()]);
                });
            });
        });
--- a/crates/agent2/src/tools/list_directory_tool.rs
+++ b/crates/agent2/src/tools/list_directory_tool.rs
@@ -2,12 +2,12 @@ use crate::{AgentTool, ToolCallEventStream};
 use agent_client_protocol::ToolKind;
 use anyhow::{Result, anyhow};
 use gpui::{App, Entity, SharedString, Task};
-use project::{Project, ProjectPath, WorktreeSettings};
+use project::{Project, WorktreeSettings};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
 use std::fmt::Write;
-use std::sync::Arc;
+use std::{path::Path, sync::Arc};
 use util::markdown::MarkdownInlineCode;

 /// Lists files and directories in a given path. Prefer the `grep` or `find_path` tools when searching the codebase.
@@ -86,13 +86,13 @@ impl AgentTool for ListDirectoryTool {
                .read(cx)
                .worktrees(cx)
                .filter_map(|worktree| {
-                    let worktree = worktree.read(cx);
-                    let root_entry = worktree.root_entry()?;
-                    if root_entry.is_dir() {
-                        Some(root_entry.path.display(worktree.path_style()))
-                    } else {
-                        None
-                    }
+                    worktree.read(cx).root_entry().and_then(|entry| {
+                        if entry.is_dir() {
+                            entry.path.to_str()
+                        } else {
+                            None
+                        }
+                    })
                })
                .collect::<Vec<_>>()
                .join("\n");
@@ -143,7 +143,7 @@ impl AgentTool for ListDirectoryTool {
        }

        let worktree_snapshot = worktree.read(cx).snapshot();
-        let worktree_root_name = worktree.read(cx).root_name();
+        let worktree_root_name = worktree.read(cx).root_name().to_string();

        let Some(entry) = worktree_snapshot.entry_for_path(&project_path.path) else {
            return Task::ready(Err(anyhow!("Path not found: {}", input.path)));
@@ -165,17 +165,25 @@ impl AgentTool for ListDirectoryTool {
                continue;
            }

-            let project_path: ProjectPath = (worktree_snapshot.id(), entry.path.clone()).into();
-            if worktree_settings.is_path_excluded(&project_path.path)
-                || worktree_settings.is_path_private(&project_path.path)
+            if self
+                .project
+                .read(cx)
+                .find_project_path(&entry.path, cx)
+                .map(|project_path| {
+                    let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
+
+                    worktree_settings.is_path_excluded(&project_path.path)
+                        || worktree_settings.is_path_private(&project_path.path)
+                })
+                .unwrap_or(false)
            {
                continue;
            }

-            let full_path = worktree_root_name
+            let full_path = Path::new(&worktree_root_name)
                .join(&entry.path)
-                .display(worktree_snapshot.path_style())
-                .into_owned();
+                .display()
+                .to_string();
            if entry.is_dir() {
                folders.push(full_path);
            } else {
@@ -206,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;
@@ -413,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(),
+                    ]);
                });
            });
        });
@@ -560,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()]);
                });
            });
        });
--- a/crates/agent2/src/tools/move_path_tool.rs
+++ b/crates/agent2/src/tools/move_path_tool.rs
@@ -98,7 +98,7 @@ impl AgentTool for MovePathTool {
                .and_then(|project_path| project.entry_for_path(&project_path, cx))
            {
                Some(entity) => match project.find_project_path(&input.destination_path, cx) {
-                    Some(project_path) => project.rename_entry(entity.id, project_path, cx),
+                    Some(project_path) => project.rename_entry(entity.id, project_path.path, cx),
                    None => Task::ready(Err(anyhow!(
                        "Destination path {} was outside the project.",
                        input.destination_path
--- a/crates/agent2/src/tools/open_tool.rs
+++ b/crates/agent2/src/tools/open_tool.rs
@@ -104,7 +104,7 @@ mod tests {
    async fn test_to_absolute_path(cx: &mut TestAppContext) {
        init_test(cx);
        let temp_dir = TempDir::new().expect("Failed to create temp directory");
-        let temp_path = temp_dir.path().to_string_lossy().into_owned();
+        let temp_path = temp_dir.path().to_string_lossy().to_string();

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -82,12 +82,12 @@ impl AgentTool for ReadFileTool {
        {
            match (input.start_line, input.end_line) {
                (Some(start), Some(end)) => {
-                    format!("Read file `{path}` (lines {}-{})", start, end,)
+                    format!("Read file `{}` (lines {}-{})", path.display(), start, end,)
                }
                (Some(start), None) => {
-                    format!("Read file `{path}` (from line {})", start)
+                    format!("Read file `{}` (from line {})", path.display(), start)
                }
-                _ => format!("Read file `{path}`"),
+                _ => format!("Read file `{}`", path.display()),
            }
            .into()
        } else {
@@ -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| {
@@ -225,12 +226,9 @@ impl AgentTool for ReadFileTool {
                Ok(result.into())
            } else {
                // No line ranges specified, so check file size to see if it's too big.
-                let buffer_content = outline::get_buffer_content_or_outline(
-                    buffer.clone(),
-                    Some(&abs_path.to_string_lossy()),
-                    cx,
-                )
-                .await?;
+                let buffer_content =
+                    outline::get_buffer_content_or_outline(buffer.clone(), Some(&abs_path), cx)
+                        .await?;

                action_log.update(cx, |log, cx| {
                    log.buffer_read(buffer.clone(), cx);
@@ -447,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]
@@ -477,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
@@ -490,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
@@ -503,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) {
@@ -589,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(),
+                    ]);
                });
            });
        });
@@ -807,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()]);
                });
            });
        });
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -82,7 +82,7 @@ impl AgentTool for TerminalTool {
                    .into(),
            }
        } else {
-            "".into()
+            "Run terminal command".into()
        }
    }

--- a/crates/agent_servers/Cargo.toml
+++ b/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 }
--- a/crates/agent_servers/src/acp.rs
+++ b/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())
    }

--- a/crates/agent_servers/src/agent_servers.rs
+++ b/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
--- a/crates/agent_servers/src/claude.rs
+++ b/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())
        });
    }

@@ -62,7 +57,7 @@ impl AgentServer for ClaudeCode {
        cx: &mut App,
    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
+        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
        let is_remote = delegate.project.read(cx).is_via_remote_server();
        let store = delegate.store.downgrade();
        let extra_env = load_proxy_env(cx);
--- a/crates/agent_servers/src/custom.rs
+++ b/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())
        });
    }

@@ -67,7 +61,7 @@ impl crate::AgentServer for CustomAgentServer {
        cx: &mut App,
    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
+        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
        let is_remote = delegate.project.read(cx).is_via_remote_server();
        let default_mode = self.default_mode(cx);
        let store = delegate.store.downgrade();
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -31,7 +31,7 @@ impl AgentServer for Gemini {
        cx: &mut App,
    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
+        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
        let is_remote = delegate.project.read(cx).is_via_remote_server();
        let store = delegate.store.downgrade();
        let mut extra_env = load_proxy_env(cx);
--- a/crates/agent_settings/Cargo.toml
+++ b/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
--- a/crates/agent_settings/src/agent_profile.rs
+++ b/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,
-        }
-    }
-}
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/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;
+    }
+}
--- a/crates/agent_ui/Cargo.toml
+++ b/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
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,6 +1,5 @@
 use std::cell::RefCell;
 use std::ops::Range;
-use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
@@ -14,7 +13,7 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{App, Entity, Task, WeakEntity};
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
-use project::lsp_store::{CompletionDocumentation, SymbolLocation};
+use project::lsp_store::CompletionDocumentation;
 use project::{
    Completion, CompletionDisplayOptions, CompletionIntent, CompletionResponse, Project,
    ProjectPath, Symbol, WorktreeId,
@@ -23,7 +22,6 @@ use prompt_store::PromptStore;
 use rope::Point;
 use text::{Anchor, ToPoint as _};
 use ui::prelude::*;
-use util::rel_path::RelPath;
 use workspace::Workspace;

 use crate::AgentPanel;
@@ -189,7 +187,7 @@ impl ContextPickerCompletionProvider {

    pub(crate) fn completion_for_path(
        project_path: ProjectPath,
-        path_prefix: &RelPath,
+        path_prefix: &str,
        is_recent: bool,
        is_directory: bool,
        source_range: Range<Anchor>,
@@ -197,12 +195,10 @@ impl ContextPickerCompletionProvider {
        project: Entity<Project>,
        cx: &mut App,
    ) -> Option<Completion> {
-        let path_style = project.read(cx).path_style(cx);
        let (file_name, directory) =
            crate::context_picker::file_context_picker::extract_file_name_and_directory(
                &project_path.path,
                path_prefix,
-                path_style,
            );

        let label =
@@ -254,15 +250,7 @@ impl ContextPickerCompletionProvider {

        let label = CodeLabel::plain(symbol.name.clone(), None);

-        let abs_path = match &symbol.path {
-            SymbolLocation::InProject(project_path) => {
-                project.read(cx).absolute_path(&project_path, cx)?
-            }
-            SymbolLocation::OutsideProject {
-                abs_path,
-                signature: _,
-            } => PathBuf::from(abs_path.as_ref()),
-        };
+        let abs_path = project.read(cx).absolute_path(&symbol.path, cx)?;
        let uri = MentionUri::Symbol {
            abs_path,
            name: symbol.name.clone(),
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -47,8 +47,13 @@ use std::{
 };
 use text::OffsetRangeExt;
 use theme::ThemeSettings;
-use ui::{ButtonLike, TintColor, Toggleable, prelude::*};
-use util::{ResultExt, debug_panic, rel_path::RelPath};
+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;

@@ -76,7 +81,7 @@ pub enum MessageEditorEvent {

 impl EventEmitter<MessageEditorEvent> for MessageEditor {}

-const COMMAND_HINT_INLAY_ID: u32 = 0;
+const COMMAND_HINT_INLAY_ID: usize = 0;

 impl MessageEditor {
    pub fn new(
@@ -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),
@@ -452,12 +457,9 @@ impl MessageEditor {
            .update(cx, |project, cx| project.open_buffer(project_path, cx));
        cx.spawn(async move |_, cx| {
            let buffer = buffer.await?;
-            let buffer_content = outline::get_buffer_content_or_outline(
-                buffer.clone(),
-                Some(&abs_path.to_string_lossy()),
-                &cx,
-            )
-            .await?;
+            let buffer_content =
+                outline::get_buffer_content_or_outline(buffer.clone(), Some(&abs_path), &cx)
+                    .await?;

            Ok(Mention::Text {
                content: buffer_content.text,
@@ -466,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,
@@ -683,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
@@ -695,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| {
@@ -950,7 +1039,6 @@ impl MessageEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let path_style = self.project.read(cx).path_style(cx);
        let buffer = self.editor.read(cx).buffer().clone();
        let Some(buffer) = buffer.read(cx).as_singleton() else {
            return;
@@ -960,15 +1048,18 @@ impl MessageEditor {
            let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
                continue;
            };
-            let Some(worktree) = self.project.read(cx).worktree_for_id(path.worktree_id, cx) else {
+            let Some(abs_path) = self.project.read(cx).absolute_path(&path, cx) else {
                continue;
            };
-            let abs_path = worktree.read(cx).absolutize(&path.path);
+            let path_prefix = abs_path
+                .file_name()
+                .unwrap_or(path.path.as_os_str())
+                .display()
+                .to_string();
            let (file_name, _) =
                crate::context_picker::file_context_picker::extract_file_name_and_directory(
                    &path.path,
-                    worktree.read(cx).root_name(),
-                    path_style,
+                    &path_prefix,
                );

            let uri = if entry.is_dir() {
@@ -1172,103 +1263,7 @@ 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: &RelPath) -> Vec<(Arc<RelPath>, String)> {
-        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)
-                        .to_string_lossy()
-                        .to_string(),
-                ));
-            }
-        }
-
-        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<RelPath>, String, String)>) -> String {
+fn render_directory_contents(entries: Vec<(Arc<Path>, PathBuf, String)>) -> String {
    let mut output = String::new();
    for (_relative_path, full_path, content) in entries {
        let fence = codeblock_fence_for_path(Some(&full_path), None);
@@ -1293,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()
                };

@@ -1515,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 {
@@ -1530,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)
        })
@@ -1602,7 +1593,7 @@ mod tests {
    use serde_json::json;
    use text::Point;
    use ui::{App, Context, IntoElement, Render, SharedString, Window};
-    use util::{path, paths::PathStyle, rel_path::rel_path};
+    use util::{path, uri};
    use workspace::{AppState, Item, Workspace};

    use crate::acp::{
@@ -1703,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();

@@ -1766,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)
@@ -1789,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());
@@ -1804,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
@@ -1816,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();

@@ -1834,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();

@@ -2112,18 +2103,16 @@ mod tests {
        let mut cx = VisualTestContext::from_window(*window, cx);

        let paths = vec![
-            rel_path("a/one.txt"),
-            rel_path("a/two.txt"),
-            rel_path("a/three.txt"),
-            rel_path("a/four.txt"),
-            rel_path("b/five.txt"),
-            rel_path("b/six.txt"),
-            rel_path("b/seven.txt"),
-            rel_path("b/eight.txt"),
+            path!("a/one.txt"),
+            path!("a/two.txt"),
+            path!("a/three.txt"),
+            path!("a/four.txt"),
+            path!("b/five.txt"),
+            path!("b/six.txt"),
+            path!("b/seven.txt"),
+            path!("b/eight.txt"),
        ];

-        let slash = PathStyle::local().separator();
-
        let mut opened_editors = Vec::new();
        for path in paths {
            let buffer = workspace
@@ -2131,7 +2120,7 @@ mod tests {
                    workspace.open_path(
                        ProjectPath {
                            worktree_id,
-                            path: path.into(),
+                            path: Path::new(path).into(),
                        },
                        None,
                        false,
@@ -2192,10 +2181,10 @@ mod tests {
            assert_eq!(
                current_completion_labels(editor),
                &[
-                    format!("eight.txt dir{slash}b{slash}"),
-                    format!("seven.txt dir{slash}b{slash}"),
-                    format!("six.txt dir{slash}b{slash}"),
-                    format!("five.txt dir{slash}b{slash}"),
+                    "eight.txt dir/b/",
+                    "seven.txt dir/b/",
+                    "six.txt dir/b/",
+                    "five.txt dir/b/",
                ]
            );
            editor.set_text("", window, cx);
@@ -2223,14 +2212,14 @@ mod tests {
            assert_eq!(
                current_completion_labels(editor),
                &[
-                    format!("eight.txt dir{slash}b{slash}"),
-                    format!("seven.txt dir{slash}b{slash}"),
-                    format!("six.txt dir{slash}b{slash}"),
-                    format!("five.txt dir{slash}b{slash}"),
-                    "Files & Directories".into(),
-                    "Symbols".into(),
-                    "Threads".into(),
-                    "Fetch".into()
+                    "eight.txt dir/b/",
+                    "seven.txt dir/b/",
+                    "six.txt dir/b/",
+                    "five.txt dir/b/",
+                    "Files & Directories",
+                    "Symbols",
+                    "Threads",
+                    "Fetch"
                ]
            );
        });
@@ -2257,10 +2246,7 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(editor.text(cx), "Lorem @file one");
            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                vec![format!("one.txt dir{slash}a{slash}")]
-            );
+            assert_eq!(current_completion_labels(editor), vec!["one.txt dir/a/"]);
        });

        editor.update_in(&mut cx, |editor, window, cx| {
@@ -2268,11 +2254,7 @@ mod tests {
            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
        });

-        let url_one = MentionUri::File {
-            abs_path: path!("/dir/a/one.txt").into(),
-        }
-        .to_uri()
-        .to_string();
+        let url_one = uri!("file:///dir/a/one.txt");
        editor.update(&mut cx, |editor, cx| {
            let text = editor.text(cx);
            assert_eq!(text, format!("Lorem [@one.txt]({url_one}) "));
@@ -2289,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()
@@ -2311,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()
@@ -2365,23 +2341,16 @@ 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()
            .into_values()
            .collect::<Vec<_>>();

-        let url_eight = MentionUri::File {
-            abs_path: path!("/dir/b/eight.txt").into(),
-        }
-        .to_uri()
-        .to_string();
+        let url_eight = uri!("file:///dir/b/eight.txt");

        {
            let [_, (uri, Mention::Text { content, .. })] = contents.as_slice() else {
@@ -2480,20 +2449,11 @@ mod tests {
            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
        });

-        let symbol = MentionUri::Symbol {
-            abs_path: path!("/dir/a/one.txt").into(),
-            name: "MySymbol".into(),
-            line_range: 0..=0,
-        };
-
        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()
@@ -2505,7 +2465,12 @@ mod tests {
                panic!("Unexpected mentions");
            };
            pretty_assertions::assert_eq!(content, "1");
-            pretty_assertions::assert_eq!(uri, &symbol);
+            pretty_assertions::assert_eq!(
+                uri,
+                &format!("{url_one}?symbol=MySymbol#L1:1")
+                    .parse::<MentionUri>()
+                    .unwrap()
+            );
        }

        cx.run_until_parked();
@@ -2513,10 +2478,7 @@ mod tests {
        editor.read_with(&cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri(),
-                )
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
            );
        });

@@ -2526,10 +2488,10 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) @file x.png", symbol.to_uri())
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) @file x.png")
            );
            assert!(editor.has_visible_completions_menu());
-            assert_eq!(current_completion_labels(editor), &[format!("x.png dir{slash}")]);
+            assert_eq!(current_completion_labels(editor), &["x.png dir/"]);
        });

        editor.update_in(&mut cx, |editor, window, cx| {
@@ -2539,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");
@@ -2555,10 +2514,7 @@ mod tests {
        editor.read_with(&cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri()
-                )
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
            );
        });

@@ -2568,10 +2524,10 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
                    assert_eq!(
                        editor.text(cx),
-                        format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) @file x.png", symbol.to_uri())
+                        format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) @file x.png")
                    );
                    assert!(editor.has_visible_completions_menu());
-                    assert_eq!(current_completion_labels(editor), &[format!("x.png dir{slash}")]);
+                    assert_eq!(current_completion_labels(editor), &["x.png dir/"]);
                });

        editor.update_in(&mut cx, |editor, window, cx| {
@@ -2583,24 +2539,18 @@ mod tests {

        // Mention was removed
        editor.read_with(&cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri()
-                )
-            );
-        });
+                    assert_eq!(
+                        editor.text(cx),
+                        format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
+                    );
+                });

        // 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();
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/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<_>>(),
--- a/crates/agent_ui/src/acp/model_selector_popover.rs
+++ b/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,
        }
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/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?;
@@ -2079,6 +2064,27 @@ impl AcpThreadView {
        let has_location = tool_call.locations.len() == 1;
        let card_header_id = SharedString::from("inner-tool-call-header");

+        let tool_icon = if tool_call.kind == acp::ToolKind::Edit && has_location {
+            FileIcons::get_icon(&tool_call.locations[0].path, cx)
+                .map(Icon::from_path)
+                .unwrap_or(Icon::new(IconName::ToolPencil))
+        } else {
+            Icon::new(match tool_call.kind {
+                acp::ToolKind::Read => IconName::ToolSearch,
+                acp::ToolKind::Edit => IconName::ToolPencil,
+                acp::ToolKind::Delete => IconName::ToolDeleteFile,
+                acp::ToolKind::Move => IconName::ArrowRightLeft,
+                acp::ToolKind::Search => IconName::ToolSearch,
+                acp::ToolKind::Execute => IconName::ToolTerminal,
+                acp::ToolKind::Think => IconName::ToolThink,
+                acp::ToolKind::Fetch => IconName::ToolWeb,
+                acp::ToolKind::SwitchMode => IconName::ArrowRightLeft,
+                acp::ToolKind::Other => IconName::ToolHammer,
+            })
+        }
+        .size(IconSize::Small)
+        .color(Color::Muted);
+
        let failed_or_canceled = match &tool_call.status {
            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
            _ => false,
@@ -2088,16 +2094,41 @@ impl AcpThreadView {
            tool_call.status,
            ToolCallStatus::WaitingForConfirmation { .. }
        );
-        let is_terminal_tool = matches!(tool_call.kind, acp::ToolKind::Execute);
        let is_edit =
            matches!(tool_call.kind, acp::ToolKind::Edit) || tool_call.diffs().next().is_some();
-
-        let use_card_layout = needs_confirmation || is_edit || is_terminal_tool;
+        let use_card_layout = needs_confirmation || is_edit;

        let is_collapsible = !tool_call.content.is_empty() && !needs_confirmation;

        let is_open = needs_confirmation || self.expanded_tool_calls.contains(&tool_call.id);

+        let gradient_overlay = {
+            div()
+                .absolute()
+                .top_0()
+                .right_0()
+                .w_12()
+                .h_full()
+                .map(|this| {
+                    if use_card_layout {
+                        this.bg(linear_gradient(
+                            90.,
+                            linear_color_stop(self.tool_card_header_bg(cx), 1.),
+                            linear_color_stop(self.tool_card_header_bg(cx).opacity(0.2), 0.),
+                        ))
+                    } else {
+                        this.bg(linear_gradient(
+                            90.,
+                            linear_color_stop(cx.theme().colors().panel_background, 1.),
+                            linear_color_stop(
+                                cx.theme().colors().panel_background.opacity(0.2),
+                                0.,
+                            ),
+                        ))
+                    }
+                })
+        };
+
        let tool_output_display =
            if is_open {
                match &tool_call.status {
@@ -2182,202 +2213,104 @@ impl AcpThreadView {
                }
            })
            .mr_5()
-            .map(|this| {
-                if is_terminal_tool {
-                    this.child(
-                        v_flex()
-                            .p_1p5()
-                            .gap_0p5()
-                            .text_ui_sm(cx)
+            .child(
+                h_flex()
+                    .group(&card_header_id)
+                    .relative()
+                    .w_full()
+                    .gap_1()
+                    .justify_between()
+                    .when(use_card_layout, |this| {
+                        this.p_0p5()
+                            .rounded_t(rems_from_px(5.))
                            .bg(self.tool_card_header_bg(cx))
-                            .child(
-                                Label::new("Run Command")
-                                    .buffer_font(cx)
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                MarkdownElement::new(
-                                    tool_call.label.clone(),
-                                    terminal_command_markdown_style(window, cx),
-                                )
-                                .code_block_renderer(
-                                    markdown::CodeBlockRenderer::Default {
-                                        copy_button: false,
-                                        copy_button_on_hover: false,
-                                        border: false,
-                                    },
-                                )
-                            ),
-                    )
-                } else {
-                   this.child(
+                    })
+                    .child(
                        h_flex()
-                            .group(&card_header_id)
                            .relative()
                            .w_full()
-                            .gap_1()
-                            .justify_between()
-                            .when(use_card_layout, |this| {
-                                this.p_0p5()
-                                    .rounded_t(rems_from_px(5.))
-                                    .bg(self.tool_card_header_bg(cx))
+                            .h(window.line_height() - px(2.))
+                            .text_size(self.tool_name_font_size())
+                            .gap_1p5()
+                            .when(has_location || use_card_layout, |this| this.px_1())
+                            .when(has_location, |this| {
+                                this.cursor(CursorStyle::PointingHand)
+                                    .rounded(rems_from_px(3.)) // Concentric border radius
+                                    .hover(|s| s.bg(cx.theme().colors().element_hover.opacity(0.5)))
                            })
-                            .child(self.render_tool_call_label(
-                                entry_ix,
-                                tool_call,
-                                is_edit,
-                                use_card_layout,
-                                window,
-                                cx,
-                            ))
-                            .when(is_collapsible || failed_or_canceled, |this| {
-                                this.child(
-                                    h_flex()
-                                        .px_1()
-                                        .gap_px()
-                                        .when(is_collapsible, |this| {
-                                            this.child(
-                                            Disclosure::new(("expand", entry_ix), is_open)
-                                                .opened_icon(IconName::ChevronUp)
-                                                .closed_icon(IconName::ChevronDown)
-                                                .visible_on_hover(&card_header_id)
-                                                .on_click(cx.listener({
-                                                    let id = tool_call.id.clone();
-                                                    move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                                                        if is_open {
-                                                            this.expanded_tool_calls.remove(&id);
-                                                        } else {
-                                                            this.expanded_tool_calls.insert(id.clone());
-                                                        }
-                                                        cx.notify();
-                                                    }
-                                                })),
-                                        )
-                                        })
-                                        .when(failed_or_canceled, |this| {
-                                            this.child(
-                                                Icon::new(IconName::Close)
-                                                    .color(Color::Error)
-                                                    .size(IconSize::Small),
-                                            )
-                                        }),
-                                )
-                            }),
+                            .overflow_hidden()
+                            .child(tool_icon)
+                            .child(if has_location {
+                                h_flex()
+                                    .id(("open-tool-call-location", entry_ix))
+                                    .w_full()
+                                    .map(|this| {
+                                        if use_card_layout {
+                                            this.text_color(cx.theme().colors().text)
+                                        } else {
+                                            this.text_color(cx.theme().colors().text_muted)
+                                        }
+                                    })
+                                    .child(self.render_markdown(
+                                        tool_call.label.clone(),
+                                        MarkdownStyle {
+                                            prevent_mouse_interaction: true,
+                                            ..default_markdown_style(false, true, window, cx)
+                                        },
+                                    ))
+                                    .tooltip(Tooltip::text("Jump to File"))
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.open_tool_call_location(entry_ix, 0, window, cx);
+                                    }))
+                                    .into_any_element()
+                            } else {
+                                h_flex()
+                                    .w_full()
+                                    .child(self.render_markdown(
+                                        tool_call.label.clone(),
+                                        default_markdown_style(false, true, window, cx),
+                                    ))
+                                    .into_any()
+                            })
+                            .when(!has_location, |this| this.child(gradient_overlay)),
                    )
-                }
-            })
+                    .when(is_collapsible || failed_or_canceled, |this| {
+                        this.child(
+                            h_flex()
+                                .px_1()
+                                .gap_px()
+                                .when(is_collapsible, |this| {
+                                    this.child(
+                                    Disclosure::new(("expand", entry_ix), is_open)
+                                        .opened_icon(IconName::ChevronUp)
+                                        .closed_icon(IconName::ChevronDown)
+                                        .visible_on_hover(&card_header_id)
+                                        .on_click(cx.listener({
+                                            let id = tool_call.id.clone();
+                                            move |this: &mut Self, _, _, cx: &mut Context<Self>| {
+                                                if is_open {
+                                                    this.expanded_tool_calls.remove(&id);
+                                                } else {
+                                                    this.expanded_tool_calls.insert(id.clone());
+                                                }
+                                                cx.notify();
+                                            }
+                                        })),
+                                )
+                                })
+                                .when(failed_or_canceled, |this| {
+                                    this.child(
+                                        Icon::new(IconName::Close)
+                                            .color(Color::Error)
+                                            .size(IconSize::Small),
+                                    )
+                                }),
+                        )
+                    }),
+            )
            .children(tool_output_display)
    }

-    fn render_tool_call_label(
-        &self,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        is_edit: bool,
-        use_card_layout: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let has_location = tool_call.locations.len() == 1;
-
-        let tool_icon = if tool_call.kind == acp::ToolKind::Edit && has_location {
-            FileIcons::get_icon(&tool_call.locations[0].path, cx)
-                .map(Icon::from_path)
-                .unwrap_or(Icon::new(IconName::ToolPencil))
-        } else {
-            Icon::new(match tool_call.kind {
-                acp::ToolKind::Read => IconName::ToolSearch,
-                acp::ToolKind::Edit => IconName::ToolPencil,
-                acp::ToolKind::Delete => IconName::ToolDeleteFile,
-                acp::ToolKind::Move => IconName::ArrowRightLeft,
-                acp::ToolKind::Search => IconName::ToolSearch,
-                acp::ToolKind::Execute => IconName::ToolTerminal,
-                acp::ToolKind::Think => IconName::ToolThink,
-                acp::ToolKind::Fetch => IconName::ToolWeb,
-                acp::ToolKind::SwitchMode => IconName::ArrowRightLeft,
-                acp::ToolKind::Other => IconName::ToolHammer,
-            })
-        }
-        .size(IconSize::Small)
-        .color(Color::Muted);
-
-        let gradient_overlay = {
-            div()
-                .absolute()
-                .top_0()
-                .right_0()
-                .w_12()
-                .h_full()
-                .map(|this| {
-                    if use_card_layout {
-                        this.bg(linear_gradient(
-                            90.,
-                            linear_color_stop(self.tool_card_header_bg(cx), 1.),
-                            linear_color_stop(self.tool_card_header_bg(cx).opacity(0.2), 0.),
-                        ))
-                    } else {
-                        this.bg(linear_gradient(
-                            90.,
-                            linear_color_stop(cx.theme().colors().panel_background, 1.),
-                            linear_color_stop(
-                                cx.theme().colors().panel_background.opacity(0.2),
-                                0.,
-                            ),
-                        ))
-                    }
-                })
-        };
-
-        h_flex()
-            .relative()
-            .w_full()
-            .h(window.line_height() - px(2.))
-            .text_size(self.tool_name_font_size())
-            .gap_1p5()
-            .when(has_location || use_card_layout, |this| this.px_1())
-            .when(has_location, |this| {
-                this.cursor(CursorStyle::PointingHand)
-                    .rounded(rems_from_px(3.)) // Concentric border radius
-                    .hover(|s| s.bg(cx.theme().colors().element_hover.opacity(0.5)))
-            })
-            .overflow_hidden()
-            .child(tool_icon)
-            .child(if has_location {
-                h_flex()
-                    .id(("open-tool-call-location", entry_ix))
-                    .w_full()
-                    .map(|this| {
-                        if use_card_layout {
-                            this.text_color(cx.theme().colors().text)
-                        } else {
-                            this.text_color(cx.theme().colors().text_muted)
-                        }
-                    })
-                    .child(self.render_markdown(
-                        tool_call.label.clone(),
-                        MarkdownStyle {
-                            prevent_mouse_interaction: true,
-                            ..default_markdown_style(false, true, window, cx)
-                        },
-                    ))
-                    .tooltip(Tooltip::text("Jump to File"))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.open_tool_call_location(entry_ix, 0, window, cx);
-                    }))
-                    .into_any_element()
-            } else {
-                h_flex()
-                    .w_full()
-                    .child(self.render_markdown(
-                        tool_call.label.clone(),
-                        default_markdown_style(false, true, window, cx),
-                    ))
-                    .into_any()
-            })
-            .when(!is_edit, |this| this.child(gradient_overlay))
-    }
-
    fn render_tool_call_content(
        &self,
        entry_ix: usize,
@@ -3704,32 +3637,29 @@ impl AcpThreadView {
            |(index, (buffer, _diff))| {
                let file = buffer.read(cx).file()?;
                let path = file.path();
-                let path_style = file.path_style(cx);
-                let separator = file.path_style(cx).separator();

                let file_path = path.parent().and_then(|parent| {
-                    if parent.is_empty() {
+                    let parent_str = parent.to_string_lossy();
+
+                    if parent_str.is_empty() {
                        None
                    } else {
                        Some(
-                            Label::new(format!(
-                                "{separator}{}{separator}",
-                                parent.display(path_style)
-                            ))
-                            .color(Color::Muted)
-                            .size(LabelSize::XSmall)
-                            .buffer_font(cx),
+                            Label::new(format!("/{}{}", parent_str, std::path::MAIN_SEPARATOR_STR))
+                                .color(Color::Muted)
+                                .size(LabelSize::XSmall)
+                                .buffer_font(cx),
                        )
                    }
                });

                let file_name = path.file_name().map(|name| {
-                    Label::new(name.to_string())
+                    Label::new(name.to_string_lossy().to_string())
                        .size(LabelSize::XSmall)
                        .buffer_font(cx)
                });

-                let file_icon = FileIcons::get_icon(path.as_std_path(), cx)
+                let file_icon = FileIcons::get_icon(path, cx)
                    .map(Icon::from_path)
                    .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
                    .unwrap_or_else(|| {
@@ -4572,7 +4502,7 @@ impl AcpThreadView {
                .read(cx)
                .visible_worktrees(cx)
                .next()
-                .map(|worktree| worktree.read(cx).root_name_str().to_string())
+                .map(|worktree| worktree.read(cx).root_name().to_string())
        });

        if let Some(screen_window) = cx
@@ -5739,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);
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/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,
+                        },
+                    );
                }
            });

--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ b/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();
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/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
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
@@ -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)),
-            )
-    }
-}
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ b/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,
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/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);
+                                    },
+                                );
                            }
                        }
                    },
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/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 {
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/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);
@@ -264,7 +267,7 @@ pub fn init(
        init_language_model_settings(cx);
    }
    assistant_slash_command::init(cx);
-    agent::init(fs.clone(), cx);
+    agent::init(cx);
    agent_panel::init(cx);
    context_server_configuration::init(language_registry.clone(), fs.clone(), cx);
    TextThreadEditor::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);
+    }
 }
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -33,8 +33,6 @@ use thread_context_picker::{
 use ui::{
    ButtonLike, ContextMenu, ContextMenuEntry, ContextMenuItem, Disclosure, TintColor, prelude::*,
 };
-use util::paths::PathStyle;
-use util::rel_path::RelPath;
 use workspace::{Workspace, notifications::NotifyResultExt};

 use agent::{
@@ -230,19 +228,12 @@ impl ContextPicker {
        let context_picker = cx.entity();

        let menu = ContextMenu::build(window, cx, move |menu, _window, cx| {
-            let Some(workspace) = self.workspace.upgrade() else {
-                return menu;
-            };
-            let path_style = workspace.read(cx).path_style(cx);
            let recent = self.recent_entries(cx);
            let has_recent = !recent.is_empty();
            let recent_entries = recent
                .into_iter()
                .enumerate()
-                .map(|(ix, entry)| {
-                    self.recent_menu_item(context_picker.clone(), ix, entry, path_style)
-                })
-                .collect::<Vec<_>>();
+                .map(|(ix, entry)| self.recent_menu_item(context_picker.clone(), ix, entry));

            let entries = self
                .workspace
@@ -404,7 +395,6 @@ impl ContextPicker {
        context_picker: Entity<ContextPicker>,
        ix: usize,
        entry: RecentEntry,
-        path_style: PathStyle,
    ) -> ContextMenuItem {
        match entry {
            RecentEntry::File {
@@ -423,7 +413,6 @@ impl ContextPicker {
                            &path,
                            &path_prefix,
                            false,
-                            path_style,
                            context_store.clone(),
                            cx,
                        )
@@ -597,7 +586,7 @@ impl Render for ContextPicker {
 pub(crate) enum RecentEntry {
    File {
        project_path: ProjectPath,
-        path_prefix: Arc<RelPath>,
+        path_prefix: Arc<str>,
    },
    Thread(ThreadContextEntry),
 }
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -13,7 +13,6 @@ use http_client::HttpClientWithUrl;
 use itertools::Itertools;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
-use project::lsp_store::SymbolLocation;
 use project::{
    Completion, CompletionDisplayOptions, CompletionIntent, CompletionResponse, ProjectPath,
    Symbol, WorktreeId,
@@ -23,8 +22,6 @@ use rope::Point;
 use text::{Anchor, OffsetRangeExt, ToPoint};
 use ui::prelude::*;
 use util::ResultExt as _;
-use util::paths::PathStyle;
-use util::rel_path::RelPath;
 use workspace::Workspace;

 use agent::{
@@ -577,12 +574,11 @@ impl ContextPickerCompletionProvider {

    fn completion_for_path(
        project_path: ProjectPath,
-        path_prefix: &RelPath,
+        path_prefix: &str,
        is_recent: bool,
        is_directory: bool,
        excerpt_id: ExcerptId,
        source_range: Range<Anchor>,
-        path_style: PathStyle,
        editor: Entity<Editor>,
        context_store: Entity<ContextStore>,
        cx: &App,
@@ -590,7 +586,6 @@ impl ContextPickerCompletionProvider {
        let (file_name, directory) = super::file_context_picker::extract_file_name_and_directory(
            &project_path.path,
            path_prefix,
-            path_style,
        );

        let label =
@@ -662,22 +657,17 @@ impl ContextPickerCompletionProvider {
        workspace: Entity<Workspace>,
        cx: &mut App,
    ) -> Option<Completion> {
-        let path_style = workspace.read(cx).path_style(cx);
-        let SymbolLocation::InProject(symbol_path) = &symbol.path else {
-            return None;
-        };
        let path_prefix = workspace
            .read(cx)
            .project()
            .read(cx)
-            .worktree_for_id(symbol_path.worktree_id, cx)?
+            .worktree_for_id(symbol.path.worktree_id, cx)?
            .read(cx)
            .root_name();

        let (file_name, directory) = super::file_context_picker::extract_file_name_and_directory(
-            &symbol_path.path,
+            &symbol.path.path,
            path_prefix,
-            path_style,
        );
        let full_path = if let Some(directory) = directory {
            format!("{}{}", directory, file_name)
@@ -753,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()));
        };

@@ -771,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);

@@ -778,7 +769,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        let text_thread_store = self.text_thread_store.clone();
        let editor = self.editor.clone();
        let http_client = workspace.read(cx).client().http_client();
-        let path_style = workspace.read(cx).path_style(cx);

        let MentionCompletion { mode, argument, .. } = state;
        let query = argument.unwrap_or_else(|| "".to_string());
@@ -845,7 +835,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                mat.is_dir,
                                excerpt_id,
                                source_range.clone(),
-                                path_style,
                                editor.clone(),
                                context_store.clone(),
                                cx,
@@ -1076,7 +1065,7 @@ mod tests {
    use serde_json::json;
    use settings::SettingsStore;
    use std::{ops::Deref, rc::Rc};
-    use util::{path, rel_path::rel_path};
+    use util::path;
    use workspace::{AppState, Item};

    #[test]
@@ -1227,18 +1216,16 @@ mod tests {
        let mut cx = VisualTestContext::from_window(*window.deref(), cx);

        let paths = vec![
-            rel_path("a/one.txt"),
-            rel_path("a/two.txt"),
-            rel_path("a/three.txt"),
-            rel_path("a/four.txt"),
-            rel_path("b/five.txt"),
-            rel_path("b/six.txt"),
-            rel_path("b/seven.txt"),
-            rel_path("b/eight.txt"),
+            path!("a/one.txt"),
+            path!("a/two.txt"),
+            path!("a/three.txt"),
+            path!("a/four.txt"),
+            path!("b/five.txt"),
+            path!("b/six.txt"),
+            path!("b/seven.txt"),
+            path!("b/eight.txt"),
        ];

-        let slash = PathStyle::local().separator();
-
        let mut opened_editors = Vec::new();
        for path in paths {
            let buffer = workspace
@@ -1246,7 +1233,7 @@ mod tests {
                    workspace.open_path(
                        ProjectPath {
                            worktree_id,
-                            path: path.into(),
+                            path: Path::new(path).into(),
                        },
                        None,
                        false,
@@ -1322,13 +1309,13 @@ mod tests {
            assert_eq!(
                current_completion_labels(editor),
                &[
-                    format!("seven.txt dir{slash}b{slash}"),
-                    format!("six.txt dir{slash}b{slash}"),
-                    format!("five.txt dir{slash}b{slash}"),
-                    format!("four.txt dir{slash}a{slash}"),
-                    "Files & Directories".into(),
-                    "Symbols".into(),
-                    "Fetch".into()
+                    "seven.txt dir/b/",
+                    "six.txt dir/b/",
+                    "five.txt dir/b/",
+                    "four.txt dir/a/",
+                    "Files & Directories",
+                    "Symbols",
+                    "Fetch"
                ]
            );
        });
@@ -1355,10 +1342,7 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(editor.text(cx), "Lorem @file one");
            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                vec![format!("one.txt dir{slash}a{slash}")]
-            );
+            assert_eq!(current_completion_labels(editor), vec!["one.txt dir/a/"]);
        });

        editor.update_in(&mut cx, |editor, window, cx| {
@@ -1367,10 +1351,7 @@ mod tests {
        });

        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt](@file:dir{slash}a{slash}one.txt) ")
-            );
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt) ");
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
                fold_ranges(editor, cx),
@@ -1381,10 +1362,7 @@ mod tests {
        cx.simulate_input(" ");

        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt](@file:dir{slash}a{slash}one.txt)  ")
-            );
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt)  ");
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
                fold_ranges(editor, cx),
@@ -1397,7 +1375,7 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!("Lorem [@one.txt](@file:dir{slash}a{slash}one.txt)  Ipsum "),
+                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum ",
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
@@ -1411,7 +1389,7 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!("Lorem [@one.txt](@file:dir{slash}a{slash}one.txt)  Ipsum @file "),
+                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum @file ",
            );
            assert!(editor.has_visible_completions_menu());
            assert_eq!(
@@ -1429,7 +1407,7 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!("Lorem [@one.txt](@file:dir{slash}a{slash}one.txt)  Ipsum [@seven.txt](@file:dir{slash}b{slash}seven.txt) ")
+                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum [@seven.txt](@file:dir/b/seven.txt) "
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
@@ -1446,7 +1424,7 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!("Lorem [@one.txt](@file:dir{slash}a{slash}one.txt)  Ipsum [@seven.txt](@file:dir{slash}b{slash}seven.txt) \n@")
+                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum [@seven.txt](@file:dir/b/seven.txt) \n@"
            );
            assert!(editor.has_visible_completions_menu());
            assert_eq!(
@@ -1467,7 +1445,7 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                format!("Lorem [@one.txt](@file:dir{slash}a{slash}one.txt)  Ipsum [@seven.txt](@file:dir{slash}b{slash}seven.txt) \n[@six.txt](@file:dir{slash}b{slash}six.txt) ")
+                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum [@seven.txt](@file:dir/b/seven.txt) \n[@six.txt](@file:dir/b/six.txt) "
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
--- a/crates/agent_ui/src/context_picker/file_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/file_context_picker.rs
@@ -1,3 +1,4 @@
+use std::path::Path;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

@@ -9,7 +10,7 @@ use gpui::{
 use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
 use ui::{ListItem, Tooltip, prelude::*};
-use util::{ResultExt as _, paths::PathStyle, rel_path::RelPath};
+use util::ResultExt as _;
 use workspace::Workspace;

 use crate::context_picker::ContextPicker;
@@ -160,8 +161,6 @@ impl PickerDelegate for FileContextPickerDelegate {
        cx: &mut Context<Picker<Self>>,
    ) -> Option<Self::ListItem> {
        let FileMatch { mat, .. } = &self.matches.get(ix)?;
-        let workspace = self.workspace.upgrade()?;
-        let path_style = workspace.read(cx).path_style(cx);

        Some(
            ListItem::new(ix)
@@ -173,7 +172,6 @@ impl PickerDelegate for FileContextPickerDelegate {
                    &mat.path,
                    &mat.path_prefix,
                    mat.is_dir,
-                    path_style,
                    self.context_store.clone(),
                    cx,
                )),
@@ -216,13 +214,14 @@ pub(crate) fn search_files(

        let file_matches = project.worktrees(cx).flat_map(|worktree| {
            let worktree = worktree.read(cx);
+            let path_prefix: Arc<str> = worktree.root_name().into();
            worktree.entries(false, 0).map(move |entry| FileMatch {
                mat: PathMatch {
                    score: 0.,
                    positions: Vec::new(),
                    worktree_id: worktree.id().to_usize(),
                    path: entry.path.clone(),
-                    path_prefix: worktree.root_name().into(),
+                    path_prefix: path_prefix.clone(),
                    distance_to_relative_ancestor: 0,
                    is_dir: entry.is_dir(),
                },
@@ -252,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,
@@ -270,31 +269,51 @@ pub(crate) fn search_files(
 }

 pub fn extract_file_name_and_directory(
-    path: &RelPath,
-    path_prefix: &RelPath,
-    path_style: PathStyle,
+    path: &Path,
+    path_prefix: &str,
 ) -> (SharedString, Option<SharedString>) {
-    let full_path = path_prefix.join(path);
-    let file_name = full_path.file_name().unwrap_or_default();
-    let display_path = full_path.display(path_style);
-    let (directory, file_name) = display_path.split_at(display_path.len() - file_name.len());
-    (
-        file_name.to_string().into(),
-        Some(SharedString::new(directory)).filter(|dir| !dir.is_empty()),
-    )
+    if path == Path::new("") {
+        (
+            SharedString::from(
+                path_prefix
+                    .trim_end_matches(std::path::MAIN_SEPARATOR)
+                    .to_string(),
+            ),
+            None,
+        )
+    } else {
+        let file_name = path
+            .file_name()
+            .unwrap_or_default()
+            .to_string_lossy()
+            .to_string()
+            .into();
+
+        let mut directory = path_prefix
+            .trim_end_matches(std::path::MAIN_SEPARATOR)
+            .to_string();
+        if !directory.ends_with('/') {
+            directory.push('/');
+        }
+        if let Some(parent) = path.parent().filter(|parent| parent != &Path::new("")) {
+            directory.push_str(&parent.to_string_lossy());
+            directory.push('/');
+        }
+
+        (file_name, Some(directory.into()))
+    }
 }

 pub fn render_file_context_entry(
    id: ElementId,
    worktree_id: WorktreeId,
-    path: &Arc<RelPath>,
-    path_prefix: &Arc<RelPath>,
+    path: &Arc<Path>,
+    path_prefix: &Arc<str>,
    is_directory: bool,
-    path_style: PathStyle,
    context_store: WeakEntity<ContextStore>,
    cx: &App,
 ) -> Stateful<Div> {
-    let (file_name, directory) = extract_file_name_and_directory(path, path_prefix, path_style);
+    let (file_name, directory) = extract_file_name_and_directory(path, path_prefix);

    let added = context_store.upgrade().and_then(|context_store| {
        let project_path = ProjectPath {
@@ -311,9 +330,9 @@ pub fn render_file_context_entry(
    });

    let file_icon = if is_directory {
-        FileIcons::get_folder_icon(false, path.as_std_path(), cx)
+        FileIcons::get_folder_icon(false, path, cx)
    } else {
-        FileIcons::get_icon(path.as_std_path(), cx)
+        FileIcons::get_icon(path, cx)
    }
    .map(Icon::from_path)
    .unwrap_or_else(|| Icon::new(IconName::File));
--- a/crates/agent_ui/src/context_picker/symbol_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
@@ -2,14 +2,13 @@ use std::cmp::Reverse;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

-use anyhow::{Result, anyhow};
+use anyhow::Result;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
    App, AppContext, DismissEvent, Entity, FocusHandle, Focusable, Stateful, Task, WeakEntity,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
-use project::lsp_store::SymbolLocation;
 use project::{DocumentSymbol, Symbol};
 use ui::{ListItem, prelude::*};
 use util::ResultExt as _;
@@ -192,10 +191,7 @@ pub(crate) fn add_symbol(
 ) -> Task<Result<(Option<AgentContextHandle>, bool)>> {
    let project = workspace.read(cx).project().clone();
    let open_buffer_task = project.update(cx, |project, cx| {
-        let SymbolLocation::InProject(symbol_path) = &symbol.path else {
-            return Task::ready(Err(anyhow!("can't add symbol from outside of project")));
-        };
-        project.open_buffer(symbol_path.clone(), cx)
+        project.open_buffer(symbol.path.clone(), cx)
    });
    cx.spawn(async move |cx| {
        let buffer = open_buffer_task.await?;
@@ -295,11 +291,10 @@ pub(crate) fn search_symbols(
                        .map(|(id, symbol)| {
                            StringMatchCandidate::new(id, symbol.label.filter_text())
                        })
-                        .partition(|candidate| match &symbols[candidate.id].path {
-                            SymbolLocation::InProject(project_path) => project
-                                .entry_for_path(project_path, cx)
-                                .is_some_and(|e| !e.is_ignored),
-                            SymbolLocation::OutsideProject { .. } => false,
+                        .partition(|candidate| {
+                            project
+                                .entry_for_path(&symbols[candidate.id].path, cx)
+                                .is_some_and(|e| !e.is_ignored)
                        })
                })
                .log_err()
@@ -365,18 +360,13 @@ fn compute_symbol_entries(
 }

 pub fn render_symbol_context_entry(id: ElementId, entry: &SymbolEntry) -> Stateful<Div> {
-    let path = match &entry.symbol.path {
-        SymbolLocation::InProject(project_path) => {
-            project_path.path.file_name().unwrap_or_default().into()
-        }
-        SymbolLocation::OutsideProject {
-            abs_path,
-            signature: _,
-        } => abs_path
-            .file_name()
-            .map(|f| f.to_string_lossy())
-            .unwrap_or_default(),
-    };
+    let path = entry
+        .symbol
+        .path
+        .path
+        .file_name()
+        .map(|s| s.to_string_lossy())
+        .unwrap_or_default();
    let symbol_location = format!("{} L{}", path, entry.symbol.range.start.0.row + 1);

    h_flex()
--- a/crates/agent_ui/src/context_server_configuration.rs
+++ b/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));
    });
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/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;
        }

@@ -742,14 +744,19 @@ impl InlineAssistant {
            .update(cx, |editor, cx| {
                let scroll_top = editor.scroll_position(cx).y;
                let scroll_bottom = scroll_top + editor.visible_line_count().unwrap_or(0.);
-                editor_assists.scroll_lock = editor
+                let prompt_row = editor
                    .row_for_block(decorations.prompt_block_id, cx)
-                    .map(|row| row.0 as f32)
-                    .filter(|prompt_row| (scroll_top..scroll_bottom).contains(&prompt_row))
-                    .map(|prompt_row| InlineAssistScrollLock {
+                    .unwrap()
+                    .0 as f32;
+
+                if (scroll_top..scroll_bottom).contains(&prompt_row) {
+                    editor_assists.scroll_lock = Some(InlineAssistScrollLock {
                        assist_id,
                        distance_from_top: prompt_row - scroll_top,
                    });
+                } else {
+                    editor_assists.scroll_lock = None;
+                }
            })
            .ok();
    }
@@ -910,12 +917,14 @@ impl InlineAssistant {

        editor.update(cx, |editor, cx| {
            let scroll_position = editor.scroll_position(cx);
-            let target_scroll_top = editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f32
+            let target_scroll_top = editor
+                .row_for_block(decorations.prompt_block_id, cx)
+                .unwrap()
+                .0 as f32
                - scroll_lock.distance_from_top;
            if target_scroll_top != scroll_position.y {
                editor.set_scroll_position(point(scroll_position.x, target_scroll_top), window, cx);
            }
-            Some(())
        });
    }

@@ -959,14 +968,14 @@ impl InlineAssistant {
                    if let Some(decorations) = assist.decorations.as_ref() {
                        let distance_from_top = editor.update(cx, |editor, cx| {
                            let scroll_top = editor.scroll_position(cx).y;
-                            let prompt_row =
-                                editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f32;
-                            Some(prompt_row - scroll_top)
+                            let prompt_row = editor
+                                .row_for_block(decorations.prompt_block_id, cx)
+                                .unwrap()
+                                .0 as f32;
+                            prompt_row - scroll_top
                        });

-                        if distance_from_top.is_none_or(|distance_from_top| {
-                            distance_from_top != scroll_lock.distance_from_top
-                        }) {
+                        if distance_from_top != scroll_lock.distance_from_top {
                            editor_assists.scroll_lock = None;
                        }
                    }
@@ -1786,7 +1795,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()));
        }

--- a/crates/agent_ui/src/profile_selector.rs
+++ b/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,
    }
 }
--- a/crates/agent_ui/src/slash_command_settings.rs
+++ b/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) {}
+}
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ b/crates/agent_ui/src/terminal_inline_assistant.rs
@@ -238,7 +238,7 @@ impl TerminalInlineAssistant {
                let latest_output = terminal.last_n_non_empty_lines(DEFAULT_CONTEXT_LINES);
                let working_directory = terminal
                    .working_directory()
-                    .map(|path| path.to_string_lossy().into_owned());
+                    .map(|path| path.to_string_lossy().to_string());
                (latest_output, working_directory)
            })
            .ok()
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/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| {
@@ -1431,14 +1423,10 @@ impl TextThreadEditor {
            else {
                continue;
            };
-            let path_style = worktree.read(cx).path_style();
-            let full_path = worktree
-                .read(cx)
-                .root_name()
-                .join(&project_path.path)
-                .display(path_style)
-                .into_owned();
-            file_slash_command_args.push(full_path);
+            let worktree_root_name = worktree.read(cx).root_name().to_string();
+            let mut full_path = PathBuf::from(worktree_root_name.clone());
+            full_path.push(&project_path.path);
+            file_slash_command_args.push(full_path.to_string_lossy().to_string());
        }

        let cmd_name = FileSlashCommand.name();
@@ -1835,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
--- a/crates/agent_ui/src/ui/context_pill.rs
+++ b/crates/agent_ui/src/ui/context_pill.rs
@@ -17,7 +17,6 @@ use agent::context::{
    FileContextHandle, ImageContext, ImageStatus, RulesContextHandle, SelectionContextHandle,
    SymbolContextHandle, TextThreadContextHandle, ThreadContextHandle,
 };
-use util::paths::PathStyle;

 #[derive(IntoElement)]
 pub enum ContextPill {
@@ -304,54 +303,33 @@ impl AddedContext {
        cx: &App,
    ) -> Option<AddedContext> {
        match handle {
-            AgentContextHandle::File(handle) => {
-                Self::pending_file(handle, project.path_style(cx), cx)
-            }
+            AgentContextHandle::File(handle) => Self::pending_file(handle, cx),
            AgentContextHandle::Directory(handle) => Self::pending_directory(handle, project, cx),
-            AgentContextHandle::Symbol(handle) => {
-                Self::pending_symbol(handle, project.path_style(cx), cx)
-            }
-            AgentContextHandle::Selection(handle) => {
-                Self::pending_selection(handle, project.path_style(cx), cx)
-            }
+            AgentContextHandle::Symbol(handle) => Self::pending_symbol(handle, cx),
+            AgentContextHandle::Selection(handle) => Self::pending_selection(handle, cx),
            AgentContextHandle::FetchedUrl(handle) => Some(Self::fetched_url(handle)),
            AgentContextHandle::Thread(handle) => Some(Self::pending_thread(handle, cx)),
            AgentContextHandle::TextThread(handle) => Some(Self::pending_text_thread(handle, cx)),
            AgentContextHandle::Rules(handle) => Self::pending_rules(handle, prompt_store, cx),
-            AgentContextHandle::Image(handle) => {
-                Some(Self::image(handle, model, project.path_style(cx), cx))
-            }
+            AgentContextHandle::Image(handle) => Some(Self::image(handle, model, cx)),
        }
    }

-    fn pending_file(
-        handle: FileContextHandle,
-        path_style: PathStyle,
-        cx: &App,
-    ) -> Option<AddedContext> {
-        let full_path = handle
-            .buffer
-            .read(cx)
-            .file()?
-            .full_path(cx)
-            .to_string_lossy()
-            .to_string();
-        Some(Self::file(handle, &full_path, path_style, cx))
+    fn pending_file(handle: FileContextHandle, cx: &App) -> Option<AddedContext> {
+        let full_path = handle.buffer.read(cx).file()?.full_path(cx);
+        Some(Self::file(handle, &full_path, cx))
    }

-    fn file(
-        handle: FileContextHandle,
-        full_path: &str,
-        path_style: PathStyle,
-        cx: &App,
-    ) -> AddedContext {
-        let (name, parent) = extract_file_name_and_directory_from_full_path(full_path, path_style);
+    fn file(handle: FileContextHandle, full_path: &Path, cx: &App) -> AddedContext {
+        let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
+        let (name, parent) =
+            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
        AddedContext {
            kind: ContextKind::File,
            name,
            parent,
-            tooltip: Some(SharedString::new(full_path)),
-            icon_path: FileIcons::get_icon(Path::new(full_path), cx),
+            tooltip: Some(full_path_string),
+            icon_path: FileIcons::get_icon(full_path, cx),
            status: ContextStatus::Ready,
            render_hover: None,
            handle: AgentContextHandle::File(handle),
@@ -365,24 +343,19 @@ impl AddedContext {
    ) -> Option<AddedContext> {
        let worktree = project.worktree_for_entry(handle.entry_id, cx)?.read(cx);
        let entry = worktree.entry_for_id(handle.entry_id)?;
-        let full_path = worktree
-            .full_path(&entry.path)
-            .to_string_lossy()
-            .to_string();
-        Some(Self::directory(handle, &full_path, project.path_style(cx)))
+        let full_path = worktree.full_path(&entry.path);
+        Some(Self::directory(handle, &full_path))
    }

-    fn directory(
-        handle: DirectoryContextHandle,
-        full_path: &str,
-        path_style: PathStyle,
-    ) -> AddedContext {
-        let (name, parent) = extract_file_name_and_directory_from_full_path(full_path, path_style);
+    fn directory(handle: DirectoryContextHandle, full_path: &Path) -> AddedContext {
+        let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
+        let (name, parent) =
+            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
        AddedContext {
            kind: ContextKind::Directory,
            name,
            parent,
-            tooltip: Some(SharedString::new(full_path)),
+            tooltip: Some(full_path_string),
            icon_path: None,
            status: ContextStatus::Ready,
            render_hover: None,
@@ -390,17 +363,9 @@ impl AddedContext {
        }
    }

-    fn pending_symbol(
-        handle: SymbolContextHandle,
-        path_style: PathStyle,
-        cx: &App,
-    ) -> Option<AddedContext> {
-        let excerpt = ContextFileExcerpt::new(
-            &handle.full_path(cx)?.to_string_lossy(),
-            handle.enclosing_line_range(cx),
-            path_style,
-            cx,
-        );
+    fn pending_symbol(handle: SymbolContextHandle, cx: &App) -> Option<AddedContext> {
+        let excerpt =
+            ContextFileExcerpt::new(&handle.full_path(cx)?, handle.enclosing_line_range(cx), cx);
        Some(AddedContext {
            kind: ContextKind::Symbol,
            name: handle.symbol.clone(),
@@ -418,17 +383,8 @@ impl AddedContext {
        })
    }

-    fn pending_selection(
-        handle: SelectionContextHandle,
-        path_style: PathStyle,
-        cx: &App,
-    ) -> Option<AddedContext> {
-        let excerpt = ContextFileExcerpt::new(
-            &handle.full_path(cx)?.to_string_lossy(),
-            handle.line_range(cx),
-            path_style,
-            cx,
-        );
+    fn pending_selection(handle: SelectionContextHandle, cx: &App) -> Option<AddedContext> {
+        let excerpt = ContextFileExcerpt::new(&handle.full_path(cx)?, handle.line_range(cx), cx);
        Some(AddedContext {
            kind: ContextKind::Selection,
            name: excerpt.file_name_and_range.clone(),
@@ -529,13 +485,13 @@ impl AddedContext {
    fn image(
        context: ImageContext,
        model: Option<&Arc<dyn language_model::LanguageModel>>,
-        path_style: PathStyle,
        cx: &App,
    ) -> AddedContext {
        let (name, parent, icon_path) = if let Some(full_path) = context.full_path.as_ref() {
+            let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
            let (name, parent) =
-                extract_file_name_and_directory_from_full_path(full_path, path_style);
-            let icon_path = FileIcons::get_icon(Path::new(full_path), cx);
+                extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
+            let icon_path = FileIcons::get_icon(full_path, cx);
            (name, parent, icon_path)
        } else {
            ("Image".into(), None, None)
@@ -584,20 +540,19 @@ impl AddedContext {
 }

 fn extract_file_name_and_directory_from_full_path(
-    path: &str,
-    path_style: PathStyle,
+    path: &Path,
+    name_fallback: &SharedString,
 ) -> (SharedString, Option<SharedString>) {
-    let (parent, file_name) = path_style.split(path);
-    let parent = parent.and_then(|parent| {
-        let parent = parent.trim_end_matches(path_style.separator());
-        let (_, parent) = path_style.split(parent);
-        if parent.is_empty() {
-            None
-        } else {
-            Some(SharedString::new(parent))
-        }
-    });
-    (SharedString::new(file_name), parent)
+    let name = path
+        .file_name()
+        .map(|n| n.to_string_lossy().into_owned().into())
+        .unwrap_or_else(|| name_fallback.clone());
+    let parent = path
+        .parent()
+        .and_then(|p| p.file_name())
+        .map(|n| n.to_string_lossy().into_owned().into());
+
+    (name, parent)
 }

 #[derive(Debug, Clone)]
@@ -609,25 +564,25 @@ struct ContextFileExcerpt {
 }

 impl ContextFileExcerpt {
-    pub fn new(full_path: &str, line_range: Range<Point>, path_style: PathStyle, cx: &App) -> Self {
-        let (parent, file_name) = path_style.split(full_path);
+    pub fn new(full_path: &Path, line_range: Range<Point>, cx: &App) -> Self {
+        let full_path_string = full_path.to_string_lossy().into_owned();
+        let file_name = full_path
+            .file_name()
+            .map(|n| n.to_string_lossy().into_owned())
+            .unwrap_or_else(|| full_path_string.clone());
+
        let line_range_text = format!(" ({}-{})", line_range.start.row + 1, line_range.end.row + 1);
-        let mut full_path_and_range = full_path.to_owned();
+        let mut full_path_and_range = full_path_string;
        full_path_and_range.push_str(&line_range_text);
-        let mut file_name_and_range = file_name.to_owned();
+        let mut file_name_and_range = file_name;
        file_name_and_range.push_str(&line_range_text);

-        let parent_name = parent.and_then(|parent| {
-            let parent = parent.trim_end_matches(path_style.separator());
-            let (_, parent) = path_style.split(parent);
-            if parent.is_empty() {
-                None
-            } else {
-                Some(SharedString::new(parent))
-            }
-        });
+        let parent_name = full_path
+            .parent()
+            .and_then(|p| p.file_name())
+            .map(|n| n.to_string_lossy().into_owned().into());

-        let icon_path = FileIcons::get_icon(Path::new(full_path), cx);
+        let icon_path = FileIcons::get_icon(full_path, cx);

        ContextFileExcerpt {
            file_name_and_range: file_name_and_range.into(),
@@ -735,7 +690,6 @@ impl Component for AddedContext {
                    image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
                },
                None,
-                PathStyle::local(),
                cx,
            ),
        );
@@ -756,7 +710,6 @@ impl Component for AddedContext {
                        .shared(),
                },
                None,
-                PathStyle::local(),
                cx,
            ),
        );
@@ -772,7 +725,6 @@ impl Component for AddedContext {
                    image_task: Task::ready(None).shared(),
                },
                None,
-                PathStyle::local(),
                cx,
            ),
        );
@@ -815,8 +767,7 @@ mod tests {
            full_path: None,
        };

-        let added_context =
-            AddedContext::image(image_context, Some(&model), PathStyle::local(), cx);
+        let added_context = AddedContext::image(image_context, Some(&model), cx);

        assert!(matches!(
            added_context.status,
@@ -839,7 +790,7 @@ mod tests {
            full_path: None,
        };

-        let added_context = AddedContext::image(image_context, None, PathStyle::local(), cx);
+        let added_context = AddedContext::image(image_context, None, cx);

        assert!(
            matches!(added_context.status, ContextStatus::Ready),
--- a/crates/agent_ui/src/ui/end_trial_upsell.rs
+++ b/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(),
--- a/crates/ai_onboarding/Cargo.toml
+++ b/crates/ai_onboarding/Cargo.toml
@@ -18,6 +18,7 @@ default = []
 client.workspace = true
 cloud_llm_client.workspace = true
 component.workspace = true
+feature_flags.workspace = true
 gpui.workspace = true
 language_model.workspace = true
 serde.workspace = true
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -18,6 +18,7 @@ pub use young_account_banner::YoungAccountBanner;
 use std::sync::Arc;

 use client::{Client, UserStore, zed_urls};
+use feature_flags::{BillingV2FeatureFlag, FeatureFlagAppExt as _};
 use gpui::{AnyElement, Entity, IntoElement, ParentElement};
 use ui::{Divider, RegisterComponent, Tooltip, prelude::*};

@@ -84,7 +85,7 @@ impl ZedAiOnboarding {
        self
    }

-    fn render_sign_in_disclaimer(&self, _cx: &mut App) -> AnyElement {
+    fn render_sign_in_disclaimer(&self, cx: &mut App) -> AnyElement {
        let signing_in = matches!(self.sign_in_status, SignInStatus::SigningIn);

        v_flex()
@@ -95,7 +96,7 @@ impl ZedAiOnboarding {
                    .color(Color::Muted)
                    .mb_2(),
            )
-            .child(PlanDefinitions.pro_plan(true, false))
+            .child(PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), false))
            .child(
                Button::new("sign_in", "Try Zed Pro for Free")
                    .disabled(signing_in)
@@ -306,7 +307,7 @@ impl RenderOnce for ZedAiOnboarding {
    fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
        if matches!(self.sign_in_status, SignInStatus::SignedIn) {
            match self.plan {
-                None => self.render_free_plan_state(true, cx),
+                None => self.render_free_plan_state(cx.has_flag::<BillingV2FeatureFlag>(), cx),
                Some(plan @ (Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree))) => {
                    self.render_free_plan_state(plan.is_v2(), cx)
                }
@@ -371,7 +372,7 @@ impl Component for ZedAiOnboarding {
                        "Free Plan",
                        onboarding(
                            SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedFree)),
+                            Some(Plan::V1(PlanV1::ZedFree)),
                            false,
                        ),
                    ),
@@ -379,7 +380,7 @@ impl Component for ZedAiOnboarding {
                        "Pro Trial",
                        onboarding(
                            SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedProTrial)),
+                            Some(Plan::V1(PlanV1::ZedProTrial)),
                            false,
                        ),
                    ),
@@ -387,7 +388,7 @@ impl Component for ZedAiOnboarding {
                        "Pro Plan",
                        onboarding(
                            SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedPro)),
+                            Some(Plan::V1(PlanV1::ZedPro)),
                            false,
                        ),
                    ),
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;

 use client::{Client, UserStore, zed_urls};
 use cloud_llm_client::{Plan, PlanV1, PlanV2};
+use feature_flags::{BillingV2FeatureFlag, FeatureFlagAppExt};
 use gpui::{AnyElement, App, Entity, IntoElement, RenderOnce, Window};
 use ui::{CommonAnimationExt, Divider, Vector, VectorName, prelude::*};

@@ -49,7 +50,9 @@ impl AiUpsellCard {

 impl RenderOnce for AiUpsellCard {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let is_v2_plan = self.user_plan.map_or(true, |plan| plan.is_v2());
+        let is_v2_plan = self
+            .user_plan
+            .map_or(cx.has_flag::<BillingV2FeatureFlag>(), |plan| plan.is_v2());

        let pro_section = v_flex()
            .flex_grow()
@@ -212,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| {
@@ -227,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),
                                    ),
@@ -324,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(),
@@ -335,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(),
@@ -346,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(),
@@ -357,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(),
--- a/crates/ai_onboarding/src/plan_definitions.rs
+++ b/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"))
+            })
    }
 }
--- a/crates/ai_onboarding/src/young_account_banner.rs
+++ b/crates/ai_onboarding/src/young_account_banner.rs
@@ -6,7 +6,7 @@ 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 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()
--- a/crates/anthropic/Cargo.toml
+++ b/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
--- a/crates/anthropic/src/anthropic.rs
+++ b/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 {
--- a/crates/askpass/Cargo.toml
+++ b/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
--- a/crates/askpass/src/askpass.rs
+++ b/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()
    }
 }

--- a/crates/askpass/src/encrypted_password.rs
+++ b/crates/askpass/src/encrypted_password.rs
@@ -1,116 +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);
-            }
-            if len != 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
-        );
-        if password.1 != 0 {
-            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))?)
-}
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/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 {
@@ -2669,7 +2669,7 @@ impl AssistantContext {
    }

    pub fn summarize(&mut self, mut replace_old: bool, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model() else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
            return;
        };

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Sloan	4a4ee4fed7	Remove cli example	2025-09-17 18:13:51 -06:00
Michael Sloan	ea4bf46a36	Return 0 results when declaration count limit exceeded Co-authored-by: Agus <agus@zed.dev>	2025-09-17 18:10:32 -06:00
Michael Sloan	05545abab6	Checkpoint Co-authored-by: Agus <agus@zed.dev>	2025-09-17 18:10:32 -06:00
Michael Sloan	a85608566d	Checkpoint Co-authored-by: Agus Zubiaga <hi@aguz.me>	2025-09-17 17:07:30 -06:00
Michael Sloan	69af5261ea	Renames + fixes Co-authored-by: Agus <agus@zed.dev>	2025-09-17 15:02:57 -06:00
Michael Sloan	b9e2f61a38	Expand declaration ranges to line boundaries and truncate, store text for file declarations Co-authored-by: Agus <agus@zed.dev>	2025-09-17 15:00:29 -06:00
Michael Sloan	38bbb497dd	Rename definition->declaration Co-authored-by: Agus Zubiaga <hi@aguz.me>	2025-09-17 12:57:49 -06:00
Agus Zubiaga	0cc7b4a93c	Simple call site snippet test	2025-09-17 12:47:36 -03:00
Agus	cc32bfdfdf	Checkpoint: Get score_snippets to compile Co-Authored-By: Finn <finn@zed.dev>	2025-09-17 11:48:22 -03:00
Michael Sloan	50de8ddc28	Progress on porting scored_declaration.rs	2025-09-17 02:11:58 -06:00
Michael Sloan	f770011d7f	Add WIP zeta2 request types	2025-09-17 01:56:48 -06:00
Michael Sloan	f2a6b57909	Copy in experimental cli / declaration scoring code Co-authored-by: Oleksiy <oleksiy@zed.dev>	2025-09-17 01:55:06 -06:00
Michael Sloan	96b67ac70e	Add text similarity metrics	2025-09-17 01:38:02 -06:00