acp-native-rewind

acp: Rename dev command (#36908 )
Release Notes: - N/A
2025-08-25 20:58:03 -06:00 · 2025-08-25 16:04:44 -06:00 · 2025-08-25 21:16:37 +00:00 · 2025-08-25 17:34:55 -03:00 · 2025-08-25 20:23:29 +00:00 · 2025-08-25 20:18:03 +00:00
259 changed files with 13451 additions and 7548 deletions
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -19,14 +19,27 @@ self-hosted-runner:
    - namespace-profile-16x32-ubuntu-2004-arm
    - namespace-profile-32x64-ubuntu-2004-arm
    # Namespace Ubuntu 22.04 (Everything else)
-    - namespace-profile-2x4-ubuntu-2204
    - namespace-profile-4x8-ubuntu-2204
    - namespace-profile-8x16-ubuntu-2204
    - namespace-profile-16x32-ubuntu-2204
    - namespace-profile-32x64-ubuntu-2204
+    # Namespace Ubuntu 24.04 (like ubuntu-latest)
+    - namespace-profile-2x4-ubuntu-2404
    # Namespace Limited Preview
    - namespace-profile-8x16-ubuntu-2004-arm-m4
    - namespace-profile-8x32-ubuntu-2004-arm-m4
    # Self Hosted Runners
    - self-mini-macos
    - self-32vcpu-windows-2022
+
+# Disable shellcheck because it doesn't like powershell
+# This should have been triggered with initial rollout of actionlint
+# but https://github.com/zed-industries/zed/pull/36693
+# somehow caused actionlint to actually check those windows jobs
+# where previously they were being skipped. Likely caused by an
+# unknown bug in actionlint where parsing of `runs-on: [ ]`
+# breaks something else. (yuck)
+paths:
+  .github/workflows/{ci,release_nightly}.yml:
+    ignore:
+      - "shellcheck"
--- a/.github/workflows/bump_collab_staging.yml
+++ b/.github/workflows/bump_collab_staging.yml
@@ -8,7 +8,7 @@ on:
 jobs:
  update-collab-staging-tag:
    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
    steps:
      - name: Checkout repository
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
      run_nix: ${{ steps.filter.outputs.run_nix }}
      run_actionlint: ${{ steps.filter.outputs.run_actionlint }}
    runs-on:
-      - ubuntu-latest
+      - namespace-profile-2x4-ubuntu-2404
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -237,7 +237,7 @@ jobs:
        uses: ./.github/actions/build_docs

  actionlint:
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
    if: github.repository_owner == 'zed-industries' && needs.job_spec.outputs.run_actionlint == 'true'
    needs: [job_spec]
    steps:
@@ -418,7 +418,7 @@ jobs:
    if: |
      github.repository_owner == 'zed-industries' &&
      needs.job_spec.outputs.run_tests == 'true'
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
    steps:
      - name: Environment Setup
        run: |
@@ -458,7 +458,7 @@ jobs:

  tests_pass:
    name: Tests Pass
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
    needs:
      - job_spec
      - style
@@ -784,7 +784,7 @@ jobs:
  bundle-windows-x64:
    timeout-minutes: 120
    name: Create a Windows installer
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
    if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
    # if: (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling'))
    needs: [windows_tests]
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -12,7 +12,7 @@ on:
 jobs:
  danger:
    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404

    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -59,7 +59,7 @@ jobs:
    timeout-minutes: 60
    name: Run tests on Windows
    if: github.repository_owner == 'zed-industries'
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -206,9 +206,6 @@ jobs:
    runs-on: github-8vcpu-ubuntu-2404
    needs: tests
    name: Build Zed on FreeBSD
-    # env:
-    #   MYTOKEN : ${{ secrets.MYTOKEN }}
-    #   MYTOKEN2: "value2"
    steps:
      - uses: actions/checkout@v4
      - name: Build FreeBSD remote-server
@@ -243,7 +240,6 @@ jobs:

  bundle-nix:
    name: Build and cache Nix package
-    if: false
    needs: tests
    secrets: inherit
    uses: ./.github/workflows/nix.yml
@@ -252,7 +248,7 @@ jobs:
    timeout-minutes: 60
    name: Create a Windows installer
    if: github.repository_owner == 'zed-industries'
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
    needs: windows-tests
    env:
      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
@@ -294,7 +290,7 @@ jobs:
  update-nightly-tag:
    name: Update nightly tag
    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
    needs:
      - bundle-mac
      - bundle-linux-x86
--- a/.github/workflows/script_checks.yml
+++ b/.github/workflows/script_checks.yml
@@ -12,7 +12,7 @@ jobs:
  shellcheck:
    name: "ShellCheck Scripts"
    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404

    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,6 +39,26 @@ dependencies = [
 "workspace-hack",
 ]

+[[package]]
+name = "acp_tools"
+version = "0.1.0"
+dependencies = [
+ "agent-client-protocol",
+ "collections",
+ "gpui",
+ "language",
+ "markdown",
+ "project",
+ "serde",
+ "serde_json",
+ "settings",
+ "theme",
+ "ui",
+ "util",
+ "workspace",
+ "workspace-hack",
+]
+
 [[package]]
 name = "action_log"
 version = "0.1.0"
@@ -171,11 +191,10 @@ dependencies = [

 [[package]]
 name = "agent-client-protocol"
-version = "0.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c887e795097665ab95119580534e7cc1335b59e1a7fec296943e534b970f4ed"
+version = "0.0.32"
 dependencies = [
 "anyhow",
+ "async-broadcast",
 "futures 0.3.31",
 "log",
 "parking_lot",
@@ -244,6 +263,7 @@ dependencies = [
 "terminal",
 "text",
 "theme",
+ "thiserror 2.0.12",
 "tree-sitter-rust",
 "ui",
 "unindent",
@@ -263,16 +283,19 @@ name = "agent_servers"
 version = "0.1.0"
 dependencies = [
 "acp_thread",
+ "acp_tools",
 "action_log",
 "agent-client-protocol",
 "agent_settings",
- "agentic-coding-protocol",
 "anyhow",
+ "client",
 "collections",
 "context_server",
 "env_logger 0.11.8",
+ "fs",
 "futures 0.3.31",
 "gpui",
+ "gpui_tokio",
 "indoc",
 "itertools 0.14.0",
 "language",
@@ -284,6 +307,7 @@ dependencies = [
 "paths",
 "project",
 "rand 0.8.5",
+ "reqwest_client",
 "schemars",
 "semver",
 "serde",
@@ -377,6 +401,7 @@ dependencies = [
 "parking_lot",
 "paths",
 "picker",
+ "postage",
 "pretty_assertions",
 "project",
 "prompt_store",
@@ -416,24 +441,6 @@ dependencies = [
 "zed_actions",
 ]

-[[package]]
-name = "agentic-coding-protocol"
-version = "0.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e6ae951b36fa2f8d9dd6e1af6da2fcaba13d7c866cf6a9e65deda9dc6c5fe4"
-dependencies = [
- "anyhow",
- "chrono",
- "derive_more 2.0.1",
- "futures 0.3.31",
- "log",
- "parking_lot",
- "schemars",
- "semver",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -849,7 +856,7 @@ dependencies = [
 "anyhow",
 "async-trait",
 "collections",
- "derive_more 0.99.19",
+ "derive_more",
 "extension",
 "futures 0.3.31",
 "gpui",
@@ -912,7 +919,7 @@ dependencies = [
 "clock",
 "collections",
 "ctor",
- "derive_more 0.99.19",
+ "derive_more",
 "gpui",
 "icons",
 "indoc",
@@ -949,7 +956,7 @@ dependencies = [
 "cloud_llm_client",
 "collections",
 "component",
- "derive_more 0.99.19",
+ "derive_more",
 "diffy",
 "editor",
 "feature_flags",
@@ -1375,10 +1382,11 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
- "derive_more 0.99.19",
 "gpui",
- "parking_lot",
 "rodio",
+ "schemars",
+ "serde",
+ "settings",
 "util",
 "workspace-hack",
 ]
@@ -3061,7 +3069,7 @@ dependencies = [
 "cocoa 0.26.0",
 "collections",
 "credentials_provider",
- "derive_more 0.99.19",
+ "derive_more",
 "feature_flags",
 "fs",
 "futures 0.3.31",
@@ -3493,7 +3501,7 @@ name = "command_palette_hooks"
 version = "0.1.0"
 dependencies = [
 "collections",
- "derive_more 0.99.19",
+ "derive_more",
 "gpui",
 "workspace-hack",
 ]
@@ -4044,6 +4052,7 @@ dependencies = [
 name = "crashes"
 version = "0.1.0"
 dependencies = [
+ "bincode",
 "crash-handler",
 "log",
 "mach2 0.5.0",
@@ -4053,6 +4062,7 @@ dependencies = [
 "serde",
 "serde_json",
 "smol",
+ "system_specs",
 "workspace-hack",
 ]

@@ -4654,27 +4664,6 @@ dependencies = [
 "syn 2.0.101",
 ]

-[[package]]
-name = "derive_more"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
- "unicode-xid",
-]
-
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
@@ -4695,7 +4684,6 @@ dependencies = [
 "component",
 "ctor",
 "editor",
- "futures 0.3.31",
 "gpui",
 "indoc",
 "language",
@@ -5732,14 +5720,10 @@ dependencies = [
 name = "feedback"
 version = "0.1.0"
 dependencies = [
- "client",
 "editor",
 "gpui",
- "human_bytes",
 "menu",
- "release_channel",
- "serde",
- "sysinfo",
+ "system_specs",
 "ui",
 "urlencoding",
 "util",
@@ -6415,7 +6399,7 @@ dependencies = [
 "askpass",
 "async-trait",
 "collections",
- "derive_more 0.99.19",
+ "derive_more",
 "futures 0.3.31",
 "git2",
 "gpui",
@@ -7445,7 +7429,7 @@ dependencies = [
 "core-video",
 "cosmic-text",
 "ctor",
- "derive_more 0.99.19",
+ "derive_more",
 "embed-resource",
 "env_logger 0.11.8",
 "etagere",
@@ -7533,6 +7517,7 @@ dependencies = [
 name = "gpui_tokio"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
 "gpui",
 "tokio",
 "util",
@@ -7969,7 +7954,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "bytes 1.10.1",
- "derive_more 0.99.19",
+ "derive_more",
 "futures 0.3.31",
 "http 1.3.1",
 "http-body 1.0.1",
@@ -8481,6 +8466,7 @@ dependencies = [
 "theme",
 "ui",
 "util",
+ "util_macros",
 "workspace",
 "workspace-hack",
 "zed_actions",
@@ -9617,6 +9603,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "async-trait",
+ "audio",
 "collections",
 "core-foundation 0.10.0",
 "core-video",
@@ -9639,6 +9626,7 @@ dependencies = [
 "scap",
 "serde",
 "serde_json",
+ "settings",
 "sha2",
 "simplelog",
 "smallvec",
@@ -11625,6 +11613,12 @@ dependencies = [
 "hmac",
 ]

+[[package]]
+name = "pciid-parser"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0008e816fcdaf229cdd540e9b6ca2dc4a10d65c31624abb546c6420a02846e61"
+
 [[package]]
 name = "pem"
 version = "3.0.5"
@@ -13525,6 +13519,7 @@ dependencies = [
 "smol",
 "sysinfo",
 "telemetry_events",
+ "thiserror 2.0.12",
 "toml 0.8.20",
 "unindent",
 "util",
@@ -14364,12 +14359,10 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe8c9d1c68d67dd9f97ecbc6f932b60eb289c5dbddd8aa1405484a8fd2fcd984"
 dependencies = [
- "chrono",
 "dyn-clone",
 "indexmap",
 "ref-cast",
 "schemars_derive",
- "semver",
 "serde",
 "serde_json",
 ]
@@ -16145,6 +16138,21 @@ dependencies = [
 "winx",
 ]

+[[package]]
+name = "system_specs"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "client",
+ "gpui",
+ "human_bytes",
+ "pciid-parser",
+ "release_channel",
+ "serde",
+ "sysinfo",
+ "workspace-hack",
+]
+
 [[package]]
 name = "tab_switcher"
 version = "0.1.0"
@@ -16438,7 +16446,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
- "derive_more 0.99.19",
+ "derive_more",
 "fs",
 "futures 0.3.31",
 "gpui",
@@ -19779,7 +19787,6 @@ dependencies = [
 "any_vec",
 "anyhow",
 "async-recursion",
- "bincode",
 "call",
 "client",
 "clock",
@@ -19798,6 +19805,7 @@ dependencies = [
 "node_runtime",
 "parking_lot",
 "postage",
+ "pretty_assertions",
 "project",
 "remote",
 "schemars",
@@ -19953,7 +19961,6 @@ dependencies = [
 "rustix 1.0.7",
 "rustls 0.23.26",
 "rustls-webpki 0.103.1",
- "schemars",
 "scopeguard",
 "sea-orm",
 "sea-query-binder",
@@ -20387,8 +20394,9 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.201.0"
+version = "0.202.0"
 dependencies = [
+ "acp_tools",
 "activity_indicator",
 "agent",
 "agent_servers",
@@ -20404,6 +20412,7 @@ dependencies = [
 "auto_update",
 "auto_update_ui",
 "backtrace",
+ "bincode",
 "breadcrumbs",
 "call",
 "channel",
@@ -20502,6 +20511,7 @@ dependencies = [
 "supermaven",
 "svg_preview",
 "sysinfo",
+ "system_specs",
 "tab_switcher",
 "task",
 "tasks_ui",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/acp_tools",
    "crates/acp_thread",
    "crates/action_log",
    "crates/activity_indicator",
@@ -155,6 +156,7 @@ members = [
    "crates/streaming_diff",
    "crates/sum_tree",
    "crates/supermaven",
+    "crates/system_specs",
    "crates/supermaven_api",
    "crates/svg_preview",
    "crates/tab_switcher",
@@ -226,6 +228,7 @@ edition = "2024"
 # Workspace member crates
 #

+acp_tools = { path = "crates/acp_tools" }
 acp_thread = { path = "crates/acp_thread" }
 action_log = { path = "crates/action_log" }
 agent = { path = "crates/agent" }
@@ -381,6 +384,7 @@ streaming_diff = { path = "crates/streaming_diff" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
+system_specs = { path = "crates/system_specs" }
 tab_switcher = { path = "crates/tab_switcher" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
@@ -422,8 +426,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #

-agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.28"
+agent-client-protocol = { path = "../agent-client-protocol"}
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
@@ -450,6 +453,7 @@ aws-sdk-bedrockruntime = { version = "1.80.0", features = [
 aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
+bincode = "1.2.1"
 bitflags = "2.6.0"
 blade-graphics = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
 blade-macros = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
@@ -493,6 +497,7 @@ handlebars = "4.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
+human_bytes = "0.4.1"
 html5ever = "0.27.0"
 http = "1.1"
 http-body = "1.0"
@@ -532,6 +537,7 @@ palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 parse_int = "0.9"
+pciid-parser = "0.8.0"
 pathdiff = "0.2"
 pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
 pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
@@ -802,147 +808,32 @@ unexpected_cfgs = { level = "allow" }
 dbg_macro = "deny"
 todo = "deny"

-# Motivation: We use `vec![a..b]` a lot when dealing with ranges in text, so
-# warning on this rule produces a lot of noise.
-single_range_in_vec_init = "allow"
-
-redundant_clone = "warn"
+# This is not a style lint, see https://github.com/rust-lang/rust-clippy/pull/15454
+# Remove when the lint gets promoted to `suspicious`.
 declare_interior_mutable_const = "deny"

-# These are all of the rules that currently have violations in the Zed
-# codebase.
-#
-# We'll want to drive this list down by either:
-# 1. fixing violations of the rule and begin enforcing it
-# 2. deciding we want to allow the rule permanently, at which point
-#    we should codify that separately above.
-#
-# This list shouldn't be added to; it should only get shorter.
-# =============================================================================
+redundant_clone = "deny"

-# There are a bunch of rules currently failing in the `style` group, so
-# allow all of those, for now.
+# We currently do not restrict any style rules
+# as it slows down shipping code to Zed.
+#
+# Running ./script/clippy can take several minutes, and so it's
+# common to skip that step and let CI do it. Any unexpected failures
+# (which also take minutes to discover) thus require switching back
+# to an old branch, manual fixing, and re-pushing.
+#
+# In the future we could improve this by either making sure
+# Zed can surface clippy errors in diagnostics (in addition to the
+# rust-analyzer errors), or by having CI fix style nits automatically.
 style = { level = "allow", priority = -1 }

-# Temporary list of style lints that we've fixed so far.
-# Progress is being tracked in #36577
-blocks_in_conditions = "warn"
-bool_assert_comparison = "warn"
-borrow_interior_mutable_const = "warn"
-box_default = "warn"
-builtin_type_shadow = "warn"
-bytes_nth = "warn"
-chars_next_cmp = "warn"
-cmp_null = "warn"
-collapsible_else_if = "warn"
-collapsible_if = "warn"
-comparison_to_empty = "warn"
-default_instead_of_iter_empty = "warn"
-disallowed_macros = "warn"
-disallowed_methods = "warn"
-disallowed_names = "warn"
-disallowed_types = "warn"
-doc_lazy_continuation = "warn"
-doc_overindented_list_items = "warn"
-duplicate_underscore_argument = "warn"
-err_expect = "warn"
-fn_to_numeric_cast = "warn"
-fn_to_numeric_cast_with_truncation = "warn"
-for_kv_map = "warn"
-implicit_saturating_add = "warn"
-implicit_saturating_sub = "warn"
-inconsistent_digit_grouping = "warn"
-infallible_destructuring_match = "warn"
-inherent_to_string = "warn"
-init_numbered_fields = "warn"
-into_iter_on_ref = "warn"
-io_other_error = "warn"
-items_after_test_module = "warn"
-iter_cloned_collect = "warn"
-iter_next_slice = "warn"
-iter_nth = "warn"
-iter_nth_zero = "warn"
-iter_skip_next = "warn"
-just_underscores_and_digits = "warn"
-len_zero = "warn"
-let_and_return = "warn"
-main_recursion = "warn"
-manual_bits = "warn"
-manual_dangling_ptr = "warn"
-manual_is_ascii_check = "warn"
-manual_is_finite = "warn"
-manual_is_infinite = "warn"
-manual_map = "warn"
-manual_next_back = "warn"
-manual_non_exhaustive = "warn"
-manual_ok_or = "warn"
-manual_pattern_char_comparison = "warn"
-manual_rotate = "warn"
-manual_slice_fill = "warn"
-manual_while_let_some = "warn"
-map_clone = "warn"
-map_collect_result_unit = "warn"
-match_like_matches_macro = "warn"
-match_overlapping_arm = "warn"
-mem_replace_option_with_none = "warn"
-mem_replace_option_with_some = "warn"
-missing_enforced_import_renames = "warn"
-missing_safety_doc = "warn"
-mixed_attributes_style = "warn"
-mixed_case_hex_literals = "warn"
-module_inception = "warn"
-must_use_unit = "warn"
-mut_mutex_lock = "warn"
-needless_borrow = "warn"
-needless_doctest_main = "warn"
-needless_else = "warn"
-needless_parens_on_range_literals = "warn"
-needless_pub_self = "warn"
-needless_return = "warn"
-needless_return_with_question_mark = "warn"
-non_minimal_cfg = "warn"
-ok_expect = "warn"
-owned_cow = "warn"
-print_literal = "warn"
-print_with_newline = "warn"
-println_empty_string = "warn"
-ptr_eq = "warn"
-question_mark = "warn"
-redundant_closure = "warn"
-redundant_field_names = "warn"
-redundant_pattern_matching = "warn"
-redundant_static_lifetimes = "warn"
-result_map_or_into_option = "warn"
-self_named_constructors = "warn"
-single_match = "warn"
-tabs_in_doc_comments = "warn"
-to_digit_is_some = "warn"
-toplevel_ref_arg = "warn"
-unnecessary_fold = "warn"
-unnecessary_map_or = "warn"
-unnecessary_mut_passed = "warn"
-unnecessary_owned_empty_strings = "warn"
-unneeded_struct_pattern = "warn"
-unsafe_removed_from_name = "warn"
-unused_unit = "warn"
-unusual_byte_groupings = "warn"
-while_let_on_iterator = "warn"
-write_literal = "warn"
-write_with_newline = "warn"
-writeln_empty_string = "warn"
-wrong_self_convention = "warn"
-zero_ptr = "warn"
-
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
-# We often return trait objects from `new` functions.
-new_ret_no_self = { level = "allow" }
-# We have a few `next` functions that differ in lifetimes
-# compared to Iterator::next. Yet, clippy complains about those.
-should_implement_trait = { level = "allow" }
 let_underscore_future = "allow"
-# It doesn't make sense to implement `Default` unilaterally.
-new_without_default = "allow"
+
+# Motivation: We use `vec![a..b]` a lot when dealing with ranges in text, so
+# warning on this rule produces a lot of noise.
+single_range_in_vec_init = "allow"

 # in Rust it can be very tedious to reduce argument count without
 # running afoul of the borrow checker.
@@ -951,10 +842,6 @@ too_many_arguments = "allow"
 # We often have large enum variants yet we rarely actually bother with splitting them up.
 large_enum_variant = "allow"

-# `enum_variant_names` fires for all enums, even when they derive serde traits.
-# Adhering to this lint would be a breaking change.
-enum_variant_names = "allow"
-
 [workspace.metadata.cargo-machete]
 ignored = [
    "bindgen",
--- a/Procfile.web
+++ b/Procfile.web
@@ -0,0 +1,2 @@
+postgrest_llm: postgrest crates/collab/postgrest_llm.conf
+website: cd ../zed.dev; npm run dev -- --port=3000
--- a/assets/icons/attach.svg
+++ b/assets/icons/attach.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.37288 4.48506L7.43539 10.6638C7.43539 10.9365 7.54373 11.1981 7.73655 11.3909C7.92938 11.5837 8.19092 11.6921 8.46362 11.6921C8.73632 11.6921 8.99785 11.5837 9.19068 11.3909C9.38351 11.1981 9.49184 10.9366 9.49184 10.6638L9.42933 4.48506C9.42933 3.93975 9.2127 3.41678 8.82711 3.03119C8.44152 2.6456 7.91855 2.42898 7.37324 2.42898C6.82794 2.42898 6.30496 2.6456 5.91937 3.03119C5.53378 3.41678 5.31716 3.93975 5.31716 4.48506L5.37968 10.6384C5.37636 11.0455 5.45368 11.4492 5.60718 11.8263C5.76067 12.2034 5.98731 12.5463 6.27401 12.8354C6.56071 13.1244 6.9018 13.3538 7.27761 13.5104C7.65341 13.667 8.0565 13.7476 8.46362 13.7476C8.87073 13.7476 9.27382 13.667 9.64963 13.5104C10.0254 13.3538 10.3665 13.1244 10.6532 12.8354C10.9399 12.5463 11.1666 12.2034 11.3201 11.8263C11.4736 11.4492 11.5509 11.0455 11.5476 10.6384L11.485 4.48506" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/copy.svg
+++ b/assets/icons/copy.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12.286 6H7.048C6.469 6 6 6.469 6 7.048v5.238c0 .578.469 1.047 1.048 1.047h5.238c.578 0 1.047-.469 1.047-1.047V7.048c0-.579-.469-1.048-1.047-1.048Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.714 10a1.05 1.05 0 0 1-1.047-1.048V3.714a1.05 1.05 0 0 1 1.047-1.047h5.238A1.05 1.05 0 0 1 10 3.714"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.486 6.2H7.24795C6.66895 6.2 6.19995 6.669 6.19995 7.248V12.486C6.19995 13.064 6.66895 13.533 7.24795 13.533H12.486C13.064 13.533 13.533 13.064 13.533 12.486V7.248C13.533 6.669 13.064 6.2 12.486 6.2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.91712 10.203C3.63951 10.2022 3.37351 10.0915 3.1773 9.89511C2.98109 9.69872 2.87064 9.43261 2.87012 9.155V3.917C2.87091 3.63956 2.98147 3.37371 3.17765 3.17753C3.37383 2.98135 3.63968 2.87079 3.91712 2.87H9.15512C9.43273 2.87053 9.69883 2.98097 9.89523 3.17718C10.0916 3.37339 10.2023 3.63939 10.2031 3.917" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/menu_alt.svg
+++ b/assets/icons/menu_alt.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.333 10H8M13.333 6H2.66701" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.66699 8H10.667M2.66699 4H13.333M2.66699 12H7.99999" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/pencil_unavailable.svg
+++ b/assets/icons/pencil_unavailable.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 5.50621L10.5941 3.41227C10.8585 3.14798 11.217 2.99953 11.5908 2.99957C11.9646 2.99962 12.3231 3.14816 12.5874 3.41252C12.8517 3.67688 13.0001 4.03541 13.0001 4.40922C13.0001 4.78304 12.8515 5.14152 12.5872 5.40582L10.493 7.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.50789 8.5L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L7.49184 10.5019" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 3L13 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/tool_think.svg
+++ b/assets/icons/tool_think.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.95231 10.2159C10.0803 9.58974 9.95231 9.57261 10.9111 8.46959C11.4686 7.82822 11.8699 7.09214 11.8699 6.27818C11.8699 5.28184 11.4658 4.32631 10.7467 3.62179C10.0275 2.91728 9.05201 2.52148 8.03492 2.52148C7.01782 2.52148 6.04239 2.91728 5.32319 3.62179C4.604 4.32631 4.19995 5.28184 4.19995 6.27818C4.19995 6.9043 4.32779 7.65565 5.1587 8.46959C6.11744 9.59098 5.98965 9.58974 6.11748 10.2159M9.95231 10.2159V12.2989C9.95231 12.9504 9.41327 13.4786 8.7482 13.4786H7.32165C6.65658 13.4786 6.11744 12.9504 6.11744 12.2989L6.11748 10.2159M9.95231 10.2159H8.03492H6.11748" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.9526 10.2625C10.0833 9.62316 9.9526 9.60566 10.9315 8.47946C11.5008 7.82461 11.9105 7.07306 11.9105 6.242C11.9105 5.22472 11.4979 4.2491 10.7637 3.52978C10.0294 2.81046 9.03338 2.40634 7.99491 2.40634C6.95644 2.40634 5.96051 2.81046 5.22619 3.52978C4.49189 4.2491 4.07935 5.22472 4.07935 6.242C4.07935 6.88128 4.20987 7.64842 5.05825 8.47946C6.03714 9.62442 5.90666 9.62316 6.03718 10.2625M9.9526 10.2625V12.3893C9.9526 13.0544 9.40223 13.5937 8.72319 13.5937H7.26665C6.58761 13.5937 6.03714 13.0544 6.03714 12.3893L6.03718 10.2625M9.9526 10.2625H7.99491H6.03718" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/zed_agent.svg
+++ b/assets/icons/zed_agent.svg
@@ -1,27 +1,27 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 8.75V10.5C8.93097 10.5 8.06903 10.5 6 10.5V10L11 6V5.5H6V7.25" stroke="black" stroke-width="1.2"/>
+<path d="M11 8.75V10.5C8.93097 10.5 8.06903 10.5 6 10.5V10L11 6V5.5H6V7.25" stroke="black" stroke-width="1.5"/>
 <path d="M2 8.5C2.27614 8.5 2.5 8.27614 2.5 8C2.5 7.72386 2.27614 7.5 2 7.5C1.72386 7.5 1.5 7.72386 1.5 8C1.5 8.27614 1.72386 8.5 2 8.5Z" fill="black"/>
-<path d="M2.99976 6.33002C3.2759 6.33002 3.49976 6.10616 3.49976 5.83002C3.49976 5.55387 3.2759 5.33002 2.99976 5.33002C2.72361 5.33002 2.49976 5.55387 2.49976 5.83002C2.49976 6.10616 2.72361 6.33002 2.99976 6.33002Z" fill="black"/>
-<path d="M2.99976 10.66C3.2759 10.66 3.49976 10.4361 3.49976 10.16C3.49976 9.88383 3.2759 9.65997 2.99976 9.65997C2.72361 9.65997 2.49976 9.88383 2.49976 10.16C2.49976 10.4361 2.72361 10.66 2.99976 10.66Z" fill="black"/>
+<path opacity="0.6" d="M2.99976 6.33002C3.2759 6.33002 3.49976 6.10616 3.49976 5.83002C3.49976 5.55387 3.2759 5.33002 2.99976 5.33002C2.72361 5.33002 2.49976 5.55387 2.49976 5.83002C2.49976 6.10616 2.72361 6.33002 2.99976 6.33002Z" fill="black"/>
+<path opacity="0.6" d="M2.99976 10.66C3.2759 10.66 3.49976 10.4361 3.49976 10.16C3.49976 9.88383 3.2759 9.65997 2.99976 9.65997C2.72361 9.65997 2.49976 9.88383 2.49976 10.16C2.49976 10.4361 2.72361 10.66 2.99976 10.66Z" fill="black"/>
 <path d="M15 8.5C15.2761 8.5 15.5 8.27614 15.5 8C15.5 7.72386 15.2761 7.5 15 7.5C14.7239 7.5 14.5 7.72386 14.5 8C14.5 8.27614 14.7239 8.5 15 8.5Z" fill="black"/>
-<path d="M14 6.33002C14.2761 6.33002 14.5 6.10616 14.5 5.83002C14.5 5.55387 14.2761 5.33002 14 5.33002C13.7239 5.33002 13.5 5.55387 13.5 5.83002C13.5 6.10616 13.7239 6.33002 14 6.33002Z" fill="black"/>
-<path d="M14 10.66C14.2761 10.66 14.5 10.4361 14.5 10.16C14.5 9.88383 14.2761 9.65997 14 9.65997C13.7239 9.65997 13.5 9.88383 13.5 10.16C13.5 10.4361 13.7239 10.66 14 10.66Z" fill="black"/>
+<path opacity="0.6" d="M14 6.33002C14.2761 6.33002 14.5 6.10616 14.5 5.83002C14.5 5.55387 14.2761 5.33002 14 5.33002C13.7239 5.33002 13.5 5.55387 13.5 5.83002C13.5 6.10616 13.7239 6.33002 14 6.33002Z" fill="black"/>
+<path opacity="0.6" d="M14 10.66C14.2761 10.66 14.5 10.4361 14.5 10.16C14.5 9.88383 14.2761 9.65997 14 9.65997C13.7239 9.65997 13.5 9.88383 13.5 10.16C13.5 10.4361 13.7239 10.66 14 10.66Z" fill="black"/>
 <path d="M8.49219 2C8.76833 2 8.99219 1.77614 8.99219 1.5C8.99219 1.22386 8.76833 1 8.49219 1C8.21605 1 7.99219 1.22386 7.99219 1.5C7.99219 1.77614 8.21605 2 8.49219 2Z" fill="black"/>
-<path d="M6 3C6.27614 3 6.5 2.77614 6.5 2.5C6.5 2.22386 6.27614 2 6 2C5.72386 2 5.5 2.22386 5.5 2.5C5.5 2.77614 5.72386 3 6 3Z" fill="black"/>
+<path opacity="0.6" d="M6 3C6.27614 3 6.5 2.77614 6.5 2.5C6.5 2.22386 6.27614 2 6 2C5.72386 2 5.5 2.22386 5.5 2.5C5.5 2.77614 5.72386 3 6 3Z" fill="black"/>
 <path d="M4 4C4.27614 4 4.5 3.77614 4.5 3.5C4.5 3.22386 4.27614 3 4 3C3.72386 3 3.5 3.22386 3.5 3.5C3.5 3.77614 3.72386 4 4 4Z" fill="black"/>
 <path d="M3.99976 13C4.2759 13 4.49976 12.7761 4.49976 12.5C4.49976 12.2239 4.2759 12 3.99976 12C3.72361 12 3.49976 12.2239 3.49976 12.5C3.49976 12.7761 3.72361 13 3.99976 13Z" fill="black"/>
-<path d="M2 12.5C2.27614 12.5 2.5 12.2761 2.5 12C2.5 11.7239 2.27614 11.5 2 11.5C1.72386 11.5 1.5 11.7239 1.5 12C1.5 12.2761 1.72386 12.5 2 12.5Z" fill="black"/>
-<path d="M2 4.5C2.27614 4.5 2.5 4.27614 2.5 4C2.5 3.72386 2.27614 3.5 2 3.5C1.72386 3.5 1.5 3.72386 1.5 4C1.5 4.27614 1.72386 4.5 2 4.5Z" fill="black"/>
-<path d="M15 12.5C15.2761 12.5 15.5 12.2761 15.5 12C15.5 11.7239 15.2761 11.5 15 11.5C14.7239 11.5 14.5 11.7239 14.5 12C14.5 12.2761 14.7239 12.5 15 12.5Z" fill="black"/>
-<path d="M15 4.5C15.2761 4.5 15.5 4.27614 15.5 4C15.5 3.72386 15.2761 3.5 15 3.5C14.7239 3.5 14.5 3.72386 14.5 4C14.5 4.27614 14.7239 4.5 15 4.5Z" fill="black"/>
-<path d="M3.99976 15C4.2759 15 4.49976 14.7761 4.49976 14.5C4.49976 14.2239 4.2759 14 3.99976 14C3.72361 14 3.49976 14.2239 3.49976 14.5C3.49976 14.7761 3.72361 15 3.99976 15Z" fill="black"/>
-<path d="M4 2C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1C3.72386 1 3.5 1.22386 3.5 1.5C3.5 1.77614 3.72386 2 4 2Z" fill="black"/>
-<path d="M13 15C13.2761 15 13.5 14.7761 13.5 14.5C13.5 14.2239 13.2761 14 13 14C12.7239 14 12.5 14.2239 12.5 14.5C12.5 14.7761 12.7239 15 13 15Z" fill="black"/>
-<path d="M13 2C13.2761 2 13.5 1.77614 13.5 1.5C13.5 1.22386 13.2761 1 13 1C12.7239 1 12.5 1.22386 12.5 1.5C12.5 1.77614 12.7239 2 13 2Z" fill="black"/>
+<path opacity="0.2" d="M2 12.5C2.27614 12.5 2.5 12.2761 2.5 12C2.5 11.7239 2.27614 11.5 2 11.5C1.72386 11.5 1.5 11.7239 1.5 12C1.5 12.2761 1.72386 12.5 2 12.5Z" fill="black"/>
+<path opacity="0.2" d="M2 4.5C2.27614 4.5 2.5 4.27614 2.5 4C2.5 3.72386 2.27614 3.5 2 3.5C1.72386 3.5 1.5 3.72386 1.5 4C1.5 4.27614 1.72386 4.5 2 4.5Z" fill="black"/>
+<path opacity="0.2" d="M15 12.5C15.2761 12.5 15.5 12.2761 15.5 12C15.5 11.7239 15.2761 11.5 15 11.5C14.7239 11.5 14.5 11.7239 14.5 12C14.5 12.2761 14.7239 12.5 15 12.5Z" fill="black"/>
+<path opacity="0.2" d="M15 4.5C15.2761 4.5 15.5 4.27614 15.5 4C15.5 3.72386 15.2761 3.5 15 3.5C14.7239 3.5 14.5 3.72386 14.5 4C14.5 4.27614 14.7239 4.5 15 4.5Z" fill="black"/>
+<path opacity="0.5" d="M3.99976 15C4.2759 15 4.49976 14.7761 4.49976 14.5C4.49976 14.2239 4.2759 14 3.99976 14C3.72361 14 3.49976 14.2239 3.49976 14.5C3.49976 14.7761 3.72361 15 3.99976 15Z" fill="black"/>
+<path opacity="0.5" d="M4 2C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1C3.72386 1 3.5 1.22386 3.5 1.5C3.5 1.77614 3.72386 2 4 2Z" fill="black"/>
+<path opacity="0.5" d="M13 15C13.2761 15 13.5 14.7761 13.5 14.5C13.5 14.2239 13.2761 14 13 14C12.7239 14 12.5 14.2239 12.5 14.5C12.5 14.7761 12.7239 15 13 15Z" fill="black"/>
+<path opacity="0.5" d="M13 2C13.2761 2 13.5 1.77614 13.5 1.5C13.5 1.22386 13.2761 1 13 1C12.7239 1 12.5 1.22386 12.5 1.5C12.5 1.77614 12.7239 2 13 2Z" fill="black"/>
 <path d="M13 4C13.2761 4 13.5 3.77614 13.5 3.5C13.5 3.22386 13.2761 3 13 3C12.7239 3 12.5 3.22386 12.5 3.5C12.5 3.77614 12.7239 4 13 4Z" fill="black"/>
 <path d="M13 13C13.2761 13 13.5 12.7761 13.5 12.5C13.5 12.2239 13.2761 12 13 12C12.7239 12 12.5 12.2239 12.5 12.5C12.5 12.7761 12.7239 13 13 13Z" fill="black"/>
-<path d="M11 3C11.2761 3 11.5 2.77614 11.5 2.5C11.5 2.22386 11.2761 2 11 2C10.7239 2 10.5 2.22386 10.5 2.5C10.5 2.77614 10.7239 3 11 3Z" fill="black"/>
+<path opacity="0.6" d="M11 3C11.2761 3 11.5 2.77614 11.5 2.5C11.5 2.22386 11.2761 2 11 2C10.7239 2 10.5 2.22386 10.5 2.5C10.5 2.77614 10.7239 3 11 3Z" fill="black"/>
 <path d="M8.5 15C8.77614 15 9 14.7761 9 14.5C9 14.2239 8.77614 14 8.5 14C8.22386 14 8 14.2239 8 14.5C8 14.7761 8.22386 15 8.5 15Z" fill="black"/>
-<path d="M6 14C6.27614 14 6.5 13.7761 6.5 13.5C6.5 13.2239 6.27614 13 6 13C5.72386 13 5.5 13.2239 5.5 13.5C5.5 13.7761 5.72386 14 6 14Z" fill="black"/>
-<path d="M11 14C11.2761 14 11.5 13.7761 11.5 13.5C11.5 13.2239 11.2761 13 11 13C10.7239 13 10.5 13.2239 10.5 13.5C10.5 13.7761 10.7239 14 11 14Z" fill="black"/>
+<path opacity="0.6" d="M6 14C6.27614 14 6.5 13.7761 6.5 13.5C6.5 13.2239 6.27614 13 6 13C5.72386 13 5.5 13.2239 5.5 13.5C5.5 13.7761 5.72386 14 6 14Z" fill="black"/>
+<path opacity="0.6" d="M11 14C11.2761 14 11.5 13.7761 11.5 13.5C11.5 13.2239 11.2761 13 11 13C10.7239 13 10.5 13.2239 10.5 13.5C10.5 13.7761 10.7239 14 11 14Z" fill="black"/>
 </svg>
--- a/assets/icons/zed_assistant.svg
+++ b/assets/icons/zed_assistant.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M8 2.93652L6.9243 6.20697C6.86924 6.37435 6.77565 6.52646 6.65105 6.65105C6.52646 6.77565 6.37435 6.86924 6.20697 6.9243L2.93652 8L6.20697 9.0757C6.37435 9.13076 6.52646 9.22435 6.65105 9.34895C6.77565 9.47354 6.86924 9.62565 6.9243 9.79306L8 13.0635L9.0757 9.79306C9.13076 9.62565 9.22435 9.47354 9.34895 9.34895C9.47354 9.22435 9.62565 9.13076 9.79306 9.0757L13.0635 8L9.79306 6.9243C9.62565 6.86924 9.47354 6.77565 9.34895 6.65105C9.22435 6.52646 9.13076 6.37435 9.0757 6.20697L8 2.93652Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -16,7 +16,6 @@
      "up": "menu::SelectPrevious",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
-      "ctrl-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
      "escape": "menu::Cancel",
      "alt-shift-enter": "menu::Restart",
@@ -138,7 +137,7 @@
      "find": "buffer_search::Deploy",
      "ctrl-f": "buffer_search::Deploy",
      "ctrl-h": "buffer_search::DeployReplace",
-      "ctrl->": "assistant::QuoteSelection",
+      "ctrl->": "agent::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
      "ctrl-alt-e": "editor::SelectEnclosingSymbol",
      "ctrl-shift-backspace": "editor::GoToPreviousChange",
@@ -241,7 +240,7 @@
      "ctrl-shift-i": "agent::ToggleOptionsMenu",
      "ctrl-alt-shift-n": "agent::ToggleNewThreadMenu",
      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "ctrl->": "assistant::QuoteSelection",
+      "ctrl->": "agent::QuoteSelection",
      "ctrl-alt-e": "agent::RemoveAllContext",
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-enter": "agent::ContinueThread",
@@ -856,7 +855,7 @@
      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-ctrl-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "project_panel::OpenWithSystem",
+      "ctrl-shift-enter": "workspace::OpenWithSystem",
      "alt-d": "project_panel::CompareMarkedFiles",
      "shift-find": "project_panel::NewSearchInDirectory",
      "ctrl-alt-shift-f": "project_panel::NewSearchInDirectory",
@@ -1195,9 +1194,16 @@
      "ctrl-1": "onboarding::ActivateBasicsPage",
      "ctrl-2": "onboarding::ActivateEditingPage",
      "ctrl-3": "onboarding::ActivateAISetupPage",
-      "ctrl-escape": "onboarding::Finish",
-      "alt-tab": "onboarding::SignIn",
+      "ctrl-enter": "onboarding::Finish",
+      "alt-shift-l": "onboarding::SignIn",
      "alt-shift-a": "onboarding::OpenAccount"
    }
+  },
+  {
+    "context": "InvalidBuffer",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-enter": "workspace::OpenWithSystem"
+    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -162,7 +162,7 @@
      "cmd-alt-f": "buffer_search::DeployReplace",
      "cmd-alt-l": ["buffer_search::Deploy", { "selection_search_enabled": true }],
      "cmd-e": ["buffer_search::Deploy", { "focus": false }],
-      "cmd->": "assistant::QuoteSelection",
+      "cmd->": "agent::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
      "cmd-alt-e": "editor::SelectEnclosingSymbol",
      "alt-enter": "editor::OpenSelectionsInMultibuffer"
@@ -281,7 +281,7 @@
      "cmd-shift-i": "agent::ToggleOptionsMenu",
      "cmd-alt-shift-n": "agent::ToggleNewThreadMenu",
      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "cmd->": "assistant::QuoteSelection",
+      "cmd->": "agent::QuoteSelection",
      "cmd-alt-e": "agent::RemoveAllContext",
      "cmd-shift-e": "project_panel::ToggleFocus",
      "cmd-ctrl-b": "agent::ToggleBurnMode",
@@ -915,7 +915,7 @@
      "cmd-backspace": ["project_panel::Trash", { "skip_prompt": true }],
      "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-cmd-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "project_panel::OpenWithSystem",
+      "ctrl-shift-enter": "workspace::OpenWithSystem",
      "alt-d": "project_panel::CompareMarkedFiles",
      "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "cmd-alt-shift-f": "project_panel::NewSearchInDirectory",
@@ -1301,5 +1301,12 @@
      "alt-tab": "onboarding::SignIn",
      "alt-shift-a": "onboarding::OpenAccount"
    }
+  },
+  {
+    "context": "InvalidBuffer",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-enter": "workspace::OpenWithSystem"
+    }
  }
 ]
--- a/assets/keymaps/linux/cursor.json
+++ b/assets/keymaps/linux/cursor.json
@@ -17,8 +17,8 @@
    "bindings": {
      "ctrl-i": "agent::ToggleFocus",
      "ctrl-shift-i": "agent::ToggleFocus",
-      "ctrl-shift-l": "assistant::QuoteSelection", // In cursor uses "Ask" mode
-      "ctrl-l": "assistant::QuoteSelection", // In cursor uses "Agent" mode
+      "ctrl-shift-l": "agent::QuoteSelection", // In cursor uses "Ask" mode
+      "ctrl-l": "agent::QuoteSelection", // In cursor uses "Agent" mode
      "ctrl-k": "assistant::InlineAssist",
      "ctrl-shift-k": "assistant::InsertIntoEditor"
    }
--- a/assets/keymaps/macos/cursor.json
+++ b/assets/keymaps/macos/cursor.json
@@ -17,8 +17,8 @@
    "bindings": {
      "cmd-i": "agent::ToggleFocus",
      "cmd-shift-i": "agent::ToggleFocus",
-      "cmd-shift-l": "assistant::QuoteSelection", // In cursor uses "Ask" mode
-      "cmd-l": "assistant::QuoteSelection", // In cursor uses "Agent" mode
+      "cmd-shift-l": "agent::QuoteSelection", // In cursor uses "Ask" mode
+      "cmd-l": "agent::QuoteSelection", // In cursor uses "Agent" mode
      "cmd-k": "assistant::InlineAssist",
      "cmd-shift-k": "assistant::InsertIntoEditor"
    }
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -819,7 +819,7 @@
      "v": "project_panel::OpenPermanent",
      "p": "project_panel::Open",
      "x": "project_panel::RevealInFileManager",
-      "s": "project_panel::OpenWithSystem",
+      "s": "workspace::OpenWithSystem",
      "z d": "project_panel::CompareMarkedFiles",
      "] c": "project_panel::SelectNextGitEntry",
      "[ c": "project_panel::SelectPrevGitEntry",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -162,6 +162,12 @@
  //  2. Always quit the application
  //         "on_last_window_closed": "quit_app",
  "on_last_window_closed": "platform_default",
+  // Whether to show padding for zoomed panels.
+  // When enabled, zoomed center panels (e.g. code editor) will have padding all around,
+  // while zoomed bottom/left/right panels will have padding to the top/right/left (respectively).
+  //
+  // Default: true
+  "zoomed_padding": true,
  // Whether to use the system provided dialogs for Open and Save As.
  // When set to false, Zed will use the built-in keyboard-first pickers.
  "use_system_path_prompts": true,
@@ -1133,11 +1139,6 @@
      // The minimum severity of the diagnostics to show inline.
      // Inherits editor's diagnostics' max severity settings when `null`.
      "max_severity": null
-    },
-    "cargo": {
-      // When enabled, Zed disables rust-analyzer's check on save and starts to query
-      // Cargo diagnostics separately.
-      "fetch_cargo_diagnostics": false
    }
  },
  // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
@@ -1503,6 +1504,11 @@
    //
    // Default: fallback
    "words": "fallback",
+    // Minimum number of characters required to automatically trigger word-based completions.
+    // Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
+    //
+    // Default: 3
+    "words_min_length": 3,
    // Whether to fetch LSP completions or not.
    //
    // Default: true
@@ -1629,6 +1635,9 @@
        "allowed": true
      }
    },
+    "Kotlin": {
+      "language_servers": ["kotlin-language-server", "!kotlin-lsp", "..."]
+    },
    "LaTeX": {
      "formatter": "language_server",
      "language_servers": ["texlab", "..."],
@@ -1642,9 +1651,6 @@
      "use_on_type_format": false,
      "allow_rewrap": "anywhere",
      "soft_wrap": "editor_width",
-      "completions": {
-        "words": "disabled"
-      },
      "prettier": {
        "allowed": true
      }
@@ -1658,9 +1664,6 @@
      }
    },
    "Plain Text": {
-      "completions": {
-        "words": "disabled"
-      },
      "allow_rewrap": "anywhere"
    },
    "Python": {
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -93,7 +93,7 @@
        "terminal.ansi.bright_cyan": "#4c806fff",
        "terminal.ansi.dim_cyan": "#cbf2e4ff",
        "terminal.ansi.white": "#bfbdb6ff",
-        "terminal.ansi.bright_white": "#bfbdb6ff",
+        "terminal.ansi.bright_white": "#fafafaff",
        "terminal.ansi.dim_white": "#787876ff",
        "link_text.hover": "#5ac1feff",
        "conflict": "#feb454ff",
@@ -479,7 +479,7 @@
        "terminal.ansi.bright_cyan": "#ace0cbff",
        "terminal.ansi.dim_cyan": "#2a5f4aff",
        "terminal.ansi.white": "#fcfcfcff",
-        "terminal.ansi.bright_white": "#fcfcfcff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#bcbec0ff",
        "link_text.hover": "#3b9ee5ff",
        "conflict": "#f1ad49ff",
@@ -865,7 +865,7 @@
        "terminal.ansi.bright_cyan": "#4c806fff",
        "terminal.ansi.dim_cyan": "#cbf2e4ff",
        "terminal.ansi.white": "#cccac2ff",
-        "terminal.ansi.bright_white": "#cccac2ff",
+        "terminal.ansi.bright_white": "#fafafaff",
        "terminal.ansi.dim_white": "#898a8aff",
        "link_text.hover": "#72cffeff",
        "conflict": "#fecf72ff",
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -94,7 +94,7 @@
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
@@ -494,7 +494,7 @@
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
@@ -894,7 +894,7 @@
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
@@ -1294,7 +1294,7 @@
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
@@ -1694,7 +1694,7 @@
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
        "terminal.ansi.white": "#f9f5d7ff",
-        "terminal.ansi.bright_white": "#f9f5d7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
@@ -2094,7 +2094,7 @@
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
        "terminal.ansi.white": "#f2e5bcff",
-        "terminal.ansi.bright_white": "#f2e5bcff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -93,7 +93,7 @@
        "terminal.ansi.bright_cyan": "#3a565bff",
        "terminal.ansi.dim_cyan": "#b9d9dfff",
        "terminal.ansi.white": "#dce0e5ff",
-        "terminal.ansi.bright_white": "#dce0e5ff",
+        "terminal.ansi.bright_white": "#fafafaff",
        "terminal.ansi.dim_white": "#575d65ff",
        "link_text.hover": "#74ade8ff",
        "version_control.added": "#27a657ff",
@@ -468,7 +468,7 @@
        "terminal.bright_foreground": "#242529ff",
        "terminal.dim_foreground": "#fafafaff",
        "terminal.ansi.black": "#242529ff",
-        "terminal.ansi.bright_black": "#242529ff",
+        "terminal.ansi.bright_black": "#747579ff",
        "terminal.ansi.dim_black": "#97979aff",
        "terminal.ansi.red": "#d36151ff",
        "terminal.ansi.bright_red": "#f0b0a4ff",
@@ -489,7 +489,7 @@
        "terminal.ansi.bright_cyan": "#a3bedaff",
        "terminal.ansi.dim_cyan": "#254058ff",
        "terminal.ansi.white": "#fafafaff",
-        "terminal.ansi.bright_white": "#fafafaff",
+        "terminal.ansi.bright_white": "#ffffffff",
        "terminal.ansi.dim_white": "#aaaaaaff",
        "link_text.hover": "#5c78e2ff",
        "version_control.added": "#27a657ff",
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -32,10 +32,15 @@ use std::time::{Duration, Instant};
 use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
 use ui::App;
 use util::ResultExt;
+use uuid::Uuid;
+
+pub fn new_prompt_id() -> acp::PromptId {
+    acp::PromptId(Uuid::new_v4().to_string().into())
+}

 #[derive(Debug)]
 pub struct UserMessage {
-    pub id: Option<UserMessageId>,
+    pub prompt_id: Option<acp::PromptId>,
    pub content: ContentBlock,
    pub chunks: Vec<acp::ContentBlock>,
    pub checkpoint: Option<Checkpoint>,
@@ -183,16 +188,15 @@ impl ToolCall {
        language_registry: Arc<LanguageRegistry>,
        cx: &mut App,
    ) -> Self {
+        let title = if let Some((first_line, _)) = tool_call.title.split_once("\n") {
+            first_line.to_owned() + "…"
+        } else {
+            tool_call.title
+        };
        Self {
            id: tool_call.id,
-            label: cx.new(|cx| {
-                Markdown::new(
-                    tool_call.title.into(),
-                    Some(language_registry.clone()),
-                    None,
-                    cx,
-                )
-            }),
+            label: cx
+                .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
            kind: tool_call.kind,
            content: tool_call
                .content
@@ -233,15 +237,30 @@ impl ToolCall {

        if let Some(title) = title {
            self.label.update(cx, |label, cx| {
-                label.replace(title, cx);
+                if let Some((first_line, _)) = title.split_once("\n") {
+                    label.replace(first_line.to_owned() + "…", cx)
+                } else {
+                    label.replace(title, cx);
+                }
            });
        }

        if let Some(content) = content {
-            self.content = content
-                .into_iter()
-                .map(|chunk| ToolCallContent::from_acp(chunk, language_registry.clone(), cx))
-                .collect();
+            let new_content_len = content.len();
+            let mut content = content.into_iter();
+
+            // Reuse existing content if we can
+            for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
+                old.update_from_acp(new, language_registry.clone(), cx);
+            }
+            for new in content {
+                self.content.push(ToolCallContent::from_acp(
+                    new,
+                    language_registry.clone(),
+                    cx,
+                ))
+            }
+            self.content.truncate(new_content_len);
        }

        if let Some(locations) = locations {
@@ -498,7 +517,7 @@ impl ContentBlock {
        "`Image`".into()
    }

-    fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
+    pub fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
        match self {
            ContentBlock::Empty => "",
            ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
@@ -551,6 +570,28 @@ impl ToolCallContent {
        }
    }

+    pub fn update_from_acp(
+        &mut self,
+        new: acp::ToolCallContent,
+        language_registry: Arc<LanguageRegistry>,
+        cx: &mut App,
+    ) {
+        let needs_update = match (&self, &new) {
+            (Self::Diff(old_diff), acp::ToolCallContent::Diff { diff: new_diff }) => {
+                old_diff.read(cx).needs_update(
+                    new_diff.old_text.as_deref().unwrap_or(""),
+                    &new_diff.new_text,
+                    cx,
+                )
+            }
+            _ => true,
+        };
+
+        if needs_update {
+            *self = Self::from_acp(new, language_registry, cx);
+        }
+    }
+
    pub fn to_markdown(&self, cx: &App) -> String {
        match self {
            Self::ContentBlock(content) => content.to_markdown(cx).to_string(),
@@ -723,6 +764,8 @@ pub struct AcpThread {
    connection: Rc<dyn AgentConnection>,
    session_id: acp::SessionId,
    token_usage: Option<TokenUsage>,
+    prompt_capabilities: acp::PromptCapabilities,
+    _observe_prompt_capabilities: Task<anyhow::Result<()>>,
 }

 #[derive(Debug)]
@@ -737,11 +780,12 @@ pub enum AcpThreadEvent {
    Stopped,
    Error,
    LoadError(LoadError),
+    PromptCapabilitiesUpdated,
 }

 impl EventEmitter<AcpThreadEvent> for AcpThread {}

-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Eq, Debug)]
 pub enum ThreadStatus {
    Idle,
    WaitingForToolConfirmation,
@@ -788,7 +832,20 @@ impl AcpThread {
        project: Entity<Project>,
        action_log: Entity<ActionLog>,
        session_id: acp::SessionId,
+        mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
+        cx: &mut Context<Self>,
    ) -> Self {
+        let prompt_capabilities = *prompt_capabilities_rx.borrow();
+        let task = cx.spawn::<_, anyhow::Result<()>>(async move |this, cx| {
+            loop {
+                let caps = prompt_capabilities_rx.recv().await?;
+                this.update(cx, |this, cx| {
+                    this.prompt_capabilities = caps;
+                    cx.emit(AcpThreadEvent::PromptCapabilitiesUpdated);
+                })?;
+            }
+        });
+
        Self {
            action_log,
            shared_buffers: Default::default(),
@@ -800,9 +857,15 @@ impl AcpThread {
            connection,
            session_id,
            token_usage: None,
+            prompt_capabilities,
+            _observe_prompt_capabilities: task,
        }
    }

+    pub fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+        self.prompt_capabilities
+    }
+
    pub fn connection(&self) -> &Rc<dyn AgentConnection> {
        &self.connection
    }
@@ -904,7 +967,7 @@ impl AcpThread {

    pub fn push_user_content_block(
        &mut self,
-        message_id: Option<UserMessageId>,
+        prompt_id: Option<acp::PromptId>,
        chunk: acp::ContentBlock,
        cx: &mut Context<Self>,
    ) {
@@ -913,13 +976,13 @@ impl AcpThread {

        if let Some(last_entry) = self.entries.last_mut()
            && let AgentThreadEntry::UserMessage(UserMessage {
-                id,
+                prompt_id: id,
                content,
                chunks,
                ..
            }) = last_entry
        {
-            *id = message_id.or(id.take());
+            *id = prompt_id.or(id.take());
            content.append(chunk.clone(), &language_registry, cx);
            chunks.push(chunk);
            let idx = entries_len - 1;
@@ -928,7 +991,7 @@ impl AcpThread {
            let content = ContentBlock::new(chunk.clone(), &language_registry, cx);
            self.push_entry(
                AgentThreadEntry::UserMessage(UserMessage {
-                    id: message_id,
+                    prompt_id,
                    content,
                    chunks: vec![chunk],
                    checkpoint: None,
@@ -987,10 +1050,19 @@ impl AcpThread {
        cx.emit(AcpThreadEvent::NewEntry);
    }

-    pub fn update_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Result<()> {
-        self.title = title;
-        cx.emit(AcpThreadEvent::TitleUpdated);
-        Ok(())
+    pub fn can_set_title(&mut self, cx: &mut Context<Self>) -> bool {
+        self.connection.set_title(&self.session_id, cx).is_some()
+    }
+
+    pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Task<Result<()>> {
+        if title != self.title {
+            self.title = title.clone();
+            cx.emit(AcpThreadEvent::TitleUpdated);
+            if let Some(set_title) = self.connection.set_title(&self.session_id, cx) {
+                return set_title.run(title, cx);
+            }
+        }
+        Task::ready(Ok(()))
    }

    pub fn update_token_usage(&mut self, usage: Option<TokenUsage>, cx: &mut Context<Self>) {
@@ -1269,6 +1341,7 @@ impl AcpThread {
        cx: &mut Context<Self>,
    ) -> BoxFuture<'static, Result<()>> {
        self.send(
+            new_prompt_id(),
            vec![acp::ContentBlock::Text(acp::TextContent {
                text: message.to_string(),
                annotations: None,
@@ -1279,6 +1352,7 @@ impl AcpThread {

    pub fn send(
        &mut self,
+        prompt_id: acp::PromptId,
        message: Vec<acp::ContentBlock>,
        cx: &mut Context<Self>,
    ) -> BoxFuture<'static, Result<()>> {
@@ -1288,26 +1362,17 @@ impl AcpThread {
            cx,
        );
        let request = acp::PromptRequest {
+            prompt_id: Some(prompt_id.clone()),
            prompt: message.clone(),
            session_id: self.session_id.clone(),
        };
        let git_store = self.project.read(cx).git_store().clone();

-        let message_id = if self
-            .connection
-            .session_editor(&self.session_id, cx)
-            .is_some()
-        {
-            Some(UserMessageId::new())
-        } else {
-            None
-        };
-
        self.run_turn(cx, async move |this, cx| {
            this.update(cx, |this, cx| {
                this.push_entry(
                    AgentThreadEntry::UserMessage(UserMessage {
-                        id: message_id.clone(),
+                        prompt_id: Some(prompt_id),
                        content: block,
                        chunks: message,
                        checkpoint: None,
@@ -1329,12 +1394,16 @@ impl AcpThread {
                        show: false,
                    });
                }
-                this.connection.prompt(message_id, request, cx)
+                this.connection.prompt(request, cx)
            })?
            .await
        })
    }

+    pub fn can_resume(&self, cx: &App) -> bool {
+        self.connection.resume(&self.session_id, cx).is_some()
+    }
+
    pub fn resume(&mut self, cx: &mut Context<Self>) -> BoxFuture<'static, Result<()>> {
        self.run_turn(cx, async move |this, cx| {
            this.update(cx, |this, cx| {
@@ -1381,7 +1450,7 @@ impl AcpThread {
                        let canceled = matches!(
                            result,
                            Ok(Ok(acp::PromptResponse {
-                                stop_reason: acp::StopReason::Canceled
+                                stop_reason: acp::StopReason::Cancelled
                            }))
                        );

@@ -1442,8 +1511,8 @@ impl AcpThread {

    /// Rewinds this thread to before the entry at `index`, removing it and all
    /// subsequent entries while reverting any changes made from that point.
-    pub fn rewind(&mut self, id: UserMessageId, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let Some(session_editor) = self.connection.session_editor(&self.session_id, cx) else {
+    pub fn rewind(&mut self, id: acp::PromptId, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let Some(rewind) = self.connection.rewind(&self.session_id, cx) else {
            return Task::ready(Err(anyhow!("not supported")));
        };
        let Some(message) = self.user_message(&id) else {
@@ -1463,8 +1532,7 @@ impl AcpThread {
                    .await?;
            }

-            cx.update(|cx| session_editor.truncate(id.clone(), cx))?
-                .await?;
+            cx.update(|cx| rewind.rewind(id.clone(), cx))?.await?;
            this.update(cx, |this, cx| {
                if let Some((ix, _)) = this.user_message_mut(&id) {
                    let range = ix..this.entries.len();
@@ -1528,10 +1596,10 @@ impl AcpThread {
            })
    }

-    fn user_message(&self, id: &UserMessageId) -> Option<&UserMessage> {
+    fn user_message(&self, id: &acp::PromptId) -> Option<&UserMessage> {
        self.entries.iter().find_map(|entry| {
            if let AgentThreadEntry::UserMessage(message) = entry {
-                if message.id.as_ref() == Some(id) {
+                if message.prompt_id.as_ref() == Some(id) {
                    Some(message)
                } else {
                    None
@@ -1542,10 +1610,10 @@ impl AcpThread {
        })
    }

-    fn user_message_mut(&mut self, id: &UserMessageId) -> Option<(usize, &mut UserMessage)> {
+    fn user_message_mut(&mut self, id: &acp::PromptId) -> Option<(usize, &mut UserMessage)> {
        self.entries.iter_mut().enumerate().find_map(|(ix, entry)| {
            if let AgentThreadEntry::UserMessage(message) = entry {
-                if message.id.as_ref() == Some(id) {
+                if message.prompt_id.as_ref() == Some(id) {
                    Some((ix, message))
                } else {
                    None
@@ -1839,7 +1907,7 @@ mod tests {
        thread.update(cx, |thread, cx| {
            assert_eq!(thread.entries.len(), 1);
            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.id, None);
+                assert_eq!(user_msg.prompt_id, None);
                assert_eq!(user_msg.content.to_markdown(cx), "Hello, ");
            } else {
                panic!("Expected UserMessage");
@@ -1847,7 +1915,7 @@ mod tests {
        });

        // Test appending to existing user message
-        let message_1_id = UserMessageId::new();
+        let message_1_id = new_prompt_id();
        thread.update(cx, |thread, cx| {
            thread.push_user_content_block(
                Some(message_1_id.clone()),
@@ -1862,7 +1930,7 @@ mod tests {
        thread.update(cx, |thread, cx| {
            assert_eq!(thread.entries.len(), 1);
            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.id, Some(message_1_id));
+                assert_eq!(user_msg.prompt_id, Some(message_1_id));
                assert_eq!(user_msg.content.to_markdown(cx), "Hello, world!");
            } else {
                panic!("Expected UserMessage");
@@ -1881,7 +1949,7 @@ mod tests {
            );
        });

-        let message_2_id = UserMessageId::new();
+        let message_2_id = new_prompt_id();
        thread.update(cx, |thread, cx| {
            thread.push_user_content_block(
                Some(message_2_id.clone()),
@@ -1896,7 +1964,7 @@ mod tests {
        thread.update(cx, |thread, cx| {
            assert_eq!(thread.entries.len(), 3);
            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[2] {
-                assert_eq!(user_msg.id, Some(message_2_id));
+                assert_eq!(user_msg.prompt_id, Some(message_2_id));
                assert_eq!(user_msg.content.to_markdown(cx), "New user message");
            } else {
                panic!("Expected UserMessage at index 2");
@@ -2193,9 +2261,13 @@ mod tests {
            .await
            .unwrap();

-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["Hi".into()], cx)))
-            .await
-            .unwrap();
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.send(new_prompt_id(), vec!["Hi".into()], cx)
+            })
+        })
+        .await
+        .unwrap();

        assert!(cx.read(|cx| !thread.read(cx).has_pending_edit_tool_calls()));
    }
@@ -2254,9 +2326,13 @@ mod tests {
            .await
            .unwrap();

-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["Lorem".into()], cx)))
-            .await
-            .unwrap();
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.send(new_prompt_id(), vec!["Lorem".into()], cx)
+            })
+        })
+        .await
+        .unwrap();
        thread.read_with(cx, |thread, cx| {
            assert_eq!(
                thread.to_markdown(cx),
@@ -2274,9 +2350,13 @@ mod tests {
        });
        assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);

-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["ipsum".into()], cx)))
-            .await
-            .unwrap();
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.send(new_prompt_id(), vec!["ipsum".into()], cx)
+            })
+        })
+        .await
+        .unwrap();
        thread.read_with(cx, |thread, cx| {
            assert_eq!(
                thread.to_markdown(cx),
@@ -2310,9 +2390,13 @@ mod tests {

        // Checkpoint isn't stored when there are no changes.
        simulate_changes.store(false, SeqCst);
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["dolor".into()], cx)))
-            .await
-            .unwrap();
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.send(new_prompt_id(), vec!["dolor".into()], cx)
+            })
+        })
+        .await
+        .unwrap();
        thread.read_with(cx, |thread, cx| {
            assert_eq!(
                thread.to_markdown(cx),
@@ -2358,7 +2442,7 @@ mod tests {
                let AgentThreadEntry::UserMessage(message) = &thread.entries[2] else {
                    panic!("unexpected entries {:?}", thread.entries)
                };
-                thread.rewind(message.id.clone().unwrap(), cx)
+                thread.rewind(message.prompt_id.clone().unwrap(), cx)
            })
            .await
            .unwrap();
@@ -2424,9 +2508,13 @@ mod tests {
            .await
            .unwrap();

-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["hello".into()], cx)))
-            .await
-            .unwrap();
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.send(new_prompt_id(), vec!["hello".into()], cx)
+            })
+        })
+        .await
+        .unwrap();
        thread.read_with(cx, |thread, cx| {
            assert_eq!(
                thread.to_markdown(cx),
@@ -2446,9 +2534,13 @@ mod tests {
        // Simulate refusing the second message, ensuring the conversation gets
        // truncated to before sending it.
        refuse_next.store(true, SeqCst);
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["world".into()], cx)))
-            .await
-            .unwrap();
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.send(new_prompt_id(), vec!["world".into()], cx)
+            })
+        })
+        .await
+        .unwrap();
        thread.read_with(cx, |thread, cx| {
            assert_eq!(
                thread.to_markdown(cx),
@@ -2558,13 +2650,19 @@ mod tests {
                    .into(),
            );
            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|_cx| {
+            let thread = cx.new(|cx| {
                AcpThread::new(
                    "Test",
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                    }),
+                    cx,
                )
            });
            self.sessions.lock().insert(session_id, thread.downgrade());
@@ -2581,7 +2679,6 @@ mod tests {

        fn prompt(
            &self,
-            _id: Option<UserMessageId>,
            params: acp::PromptRequest,
            cx: &mut App,
        ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -2598,14 +2695,6 @@ mod tests {
            }
        }

-        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-            acp::PromptCapabilities {
-                image: true,
-                audio: true,
-                embedded_context: true,
-            }
-        }
-
        fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
            let sessions = self.sessions.lock();
            let thread = sessions.get(session_id).unwrap().clone();
@@ -2619,11 +2708,11 @@ mod tests {
            .detach();
        }

-        fn session_editor(
+        fn rewind(
            &self,
            session_id: &acp::SessionId,
-            _cx: &mut App,
-        ) -> Option<Rc<dyn AgentSessionEditor>> {
+            _cx: &App,
+        ) -> Option<Rc<dyn AgentSessionRewind>> {
            Some(Rc::new(FakeAgentSessionEditor {
                _session_id: session_id.clone(),
            }))
@@ -2638,8 +2727,8 @@ mod tests {
        _session_id: acp::SessionId,
    }

-    impl AgentSessionEditor for FakeAgentSessionEditor {
-        fn truncate(&self, _message_id: UserMessageId, _cx: &mut App) -> Task<Result<()>> {
+    impl AgentSessionRewind for FakeAgentSessionEditor {
+        fn rewind(&self, _message_id: acp::PromptId, _cx: &mut App) -> Task<Result<()>> {
            Task::ready(Ok(()))
        }
    }
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -5,19 +5,8 @@ use collections::IndexMap;
 use gpui::{Entity, SharedString, Task};
 use language_model::LanguageModelProviderId;
 use project::Project;
-use serde::{Deserialize, Serialize};
-use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
+use std::{any::Any, error::Error, fmt, path::Path, rc::Rc};
 use ui::{App, IconName};
-use uuid::Uuid;
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
-pub struct UserMessageId(Arc<str>);
-
-impl UserMessageId {
-    pub fn new() -> Self {
-        Self(Uuid::new_v4().to_string().into())
-    }
-}

 pub trait AgentConnection {
    fn new_thread(
@@ -31,30 +20,32 @@ pub trait AgentConnection {

    fn authenticate(&self, method: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>>;

-    fn prompt(
-        &self,
-        user_message_id: Option<UserMessageId>,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>>;
-
-    fn prompt_capabilities(&self) -> acp::PromptCapabilities;
+    fn prompt(&self, params: acp::PromptRequest, cx: &mut App)
+    -> Task<Result<acp::PromptResponse>>;

    fn resume(
        &self,
        _session_id: &acp::SessionId,
-        _cx: &mut App,
+        _cx: &App,
    ) -> Option<Rc<dyn AgentSessionResume>> {
        None
    }

    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App);

-    fn session_editor(
+    fn rewind(
        &self,
        _session_id: &acp::SessionId,
-        _cx: &mut App,
-    ) -> Option<Rc<dyn AgentSessionEditor>> {
+        _cx: &App,
+    ) -> Option<Rc<dyn AgentSessionRewind>> {
+        None
+    }
+
+    fn set_title(
+        &self,
+        _session_id: &acp::SessionId,
+        _cx: &App,
+    ) -> Option<Rc<dyn AgentSessionSetTitle>> {
        None
    }

@@ -79,14 +70,18 @@ impl dyn AgentConnection {
    }
 }

-pub trait AgentSessionEditor {
-    fn truncate(&self, message_id: UserMessageId, cx: &mut App) -> Task<Result<()>>;
+pub trait AgentSessionRewind {
+    fn rewind(&self, message_id: acp::PromptId, cx: &mut App) -> Task<Result<()>>;
 }

 pub trait AgentSessionResume {
    fn run(&self, cx: &mut App) -> Task<Result<acp::PromptResponse>>;
 }

+pub trait AgentSessionSetTitle {
+    fn run(&self, title: SharedString, cx: &mut App) -> Task<Result<()>>;
+}
+
 pub trait AgentTelemetry {
    /// The name of the agent used for telemetry.
    fn agent_name(&self) -> String;
@@ -317,13 +312,19 @@ mod test_support {
        ) -> Task<gpui::Result<Entity<AcpThread>>> {
            let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|_cx| {
+            let thread = cx.new(|cx| {
                AcpThread::new(
                    "Test",
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                    }),
+                    cx,
                )
            });
            self.sessions.lock().insert(
@@ -336,14 +337,6 @@ mod test_support {
            Task::ready(Ok(thread))
        }

-        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-            acp::PromptCapabilities {
-                image: true,
-                audio: true,
-                embedded_context: true,
-            }
-        }
-
        fn authenticate(
            &self,
            _method_id: acp::AuthMethodId,
@@ -354,7 +347,6 @@ mod test_support {

        fn prompt(
            &self,
-            _id: Option<UserMessageId>,
            params: acp::PromptRequest,
            cx: &mut App,
        ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -420,15 +412,15 @@ mod test_support {
                .response_tx
                .take()
            {
-                end_turn_tx.send(acp::StopReason::Canceled).unwrap();
+                end_turn_tx.send(acp::StopReason::Cancelled).unwrap();
            }
        }

-        fn session_editor(
+        fn rewind(
            &self,
            _session_id: &agent_client_protocol::SessionId,
-            _cx: &mut App,
-        ) -> Option<Rc<dyn AgentSessionEditor>> {
+            _cx: &App,
+        ) -> Option<Rc<dyn AgentSessionRewind>> {
            Some(Rc::new(StubAgentSessionEditor))
        }

@@ -439,8 +431,8 @@ mod test_support {

    struct StubAgentSessionEditor;

-    impl AgentSessionEditor for StubAgentSessionEditor {
-        fn truncate(&self, _: UserMessageId, _: &mut App) -> Task<Result<()>> {
+    impl AgentSessionRewind for StubAgentSessionEditor {
+        fn rewind(&self, _: acp::PromptId, _: &mut App) -> Task<Result<()>> {
            Task::ready(Ok(()))
        }
    }
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -28,57 +28,46 @@ impl Diff {
        cx: &mut Context<Self>,
    ) -> Self {
        let multibuffer = cx.new(|_cx| MultiBuffer::without_headers(Capability::ReadOnly));
-
        let new_buffer = cx.new(|cx| Buffer::local(new_text, cx));
-        let old_buffer = cx.new(|cx| Buffer::local(old_text.unwrap_or("".into()), cx));
-        let new_buffer_snapshot = new_buffer.read(cx).text_snapshot();
-        let buffer_diff = cx.new(|cx| BufferDiff::new(&new_buffer_snapshot, cx));
-
+        let base_text = old_text.clone().unwrap_or(String::new()).into();
        let task = cx.spawn({
            let multibuffer = multibuffer.clone();
            let path = path.clone();
+            let buffer = new_buffer.clone();
            async move |_, cx| {
                let language = language_registry
                    .language_for_file_path(&path)
                    .await
                    .log_err();

-                new_buffer.update(cx, |buffer, cx| buffer.set_language(language.clone(), cx))?;
+                buffer.update(cx, |buffer, cx| buffer.set_language(language.clone(), cx))?;

-                let old_buffer_snapshot = old_buffer.update(cx, |buffer, cx| {
-                    buffer.set_language(language, cx);
-                    buffer.snapshot()
-                })?;
-
-                buffer_diff
-                    .update(cx, |diff, cx| {
-                        diff.set_base_text(
-                            old_buffer_snapshot,
-                            Some(language_registry),
-                            new_buffer_snapshot,
-                            cx,
-                        )
-                    })?
-                    .await?;
+                let diff = build_buffer_diff(
+                    old_text.unwrap_or("".into()).into(),
+                    &buffer,
+                    Some(language_registry.clone()),
+                    cx,
+                )
+                .await?;

                multibuffer
                    .update(cx, |multibuffer, cx| {
                        let hunk_ranges = {
-                            let buffer = new_buffer.read(cx);
-                            let diff = buffer_diff.read(cx);
+                            let buffer = buffer.read(cx);
+                            let diff = diff.read(cx);
                            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
                                .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
                                .collect::<Vec<_>>()
                        };

                        multibuffer.set_excerpts_for_path(
-                            PathKey::for_buffer(&new_buffer, cx),
-                            new_buffer.clone(),
+                            PathKey::for_buffer(&buffer, cx),
+                            buffer.clone(),
                            hunk_ranges,
                            editor::DEFAULT_MULTIBUFFER_CONTEXT,
                            cx,
                        );
-                        multibuffer.add_diff(buffer_diff, cx);
+                        multibuffer.add_diff(diff, cx);
                    })
                    .log_err();

@@ -89,23 +78,26 @@ impl Diff {
        Self::Finalized(FinalizedDiff {
            multibuffer,
            path,
+            base_text,
+            new_buffer,
            _update_diff: task,
        })
    }

    pub fn new(buffer: Entity<Buffer>, cx: &mut Context<Self>) -> Self {
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let base_text = buffer_snapshot.text();
-        let language_registry = buffer.read(cx).language_registry();
-        let text_snapshot = buffer.read(cx).text_snapshot();
+        let buffer_text_snapshot = buffer.read(cx).text_snapshot();
+        let base_text_snapshot = buffer.read(cx).snapshot();
+        let base_text = base_text_snapshot.text();
+        debug_assert_eq!(buffer_text_snapshot.text(), base_text);
        let buffer_diff = cx.new(|cx| {
-            let mut diff = BufferDiff::new(&text_snapshot, cx);
-            let _ = diff.set_base_text(
-                buffer_snapshot.clone(),
-                language_registry,
-                text_snapshot,
-                cx,
-            );
+            let mut diff = BufferDiff::new_unchanged(&buffer_text_snapshot, base_text_snapshot);
+            let snapshot = diff.snapshot(cx);
+            let secondary_diff = cx.new(|cx| {
+                let mut diff = BufferDiff::new(&buffer_text_snapshot, cx);
+                diff.set_snapshot(snapshot, &buffer_text_snapshot, cx);
+                diff
+            });
+            diff.set_secondary_diff(secondary_diff);
            diff
        });

@@ -123,7 +115,7 @@ impl Diff {
                    diff.update(cx);
                }
            }),
-            buffer,
+            new_buffer: buffer,
            diff: buffer_diff,
            revealed_ranges: Vec::new(),
            update_diff: Task::ready(Ok(())),
@@ -158,9 +150,9 @@ impl Diff {
            .map(|buffer| buffer.read(cx).text())
            .join("\n");
        let path = match self {
-            Diff::Pending(PendingDiff { buffer, .. }) => {
-                buffer.read(cx).file().map(|file| file.path().as_ref())
-            }
+            Diff::Pending(PendingDiff {
+                new_buffer: buffer, ..
+            }) => buffer.read(cx).file().map(|file| file.path().as_ref()),
            Diff::Finalized(FinalizedDiff { path, .. }) => Some(path.as_path()),
        };
        format!(
@@ -173,12 +165,33 @@ impl Diff {
    pub fn has_revealed_range(&self, cx: &App) -> bool {
        self.multibuffer().read(cx).excerpt_paths().next().is_some()
    }
+
+    pub fn needs_update(&self, old_text: &str, new_text: &str, cx: &App) -> bool {
+        match self {
+            Diff::Pending(PendingDiff {
+                base_text,
+                new_buffer,
+                ..
+            }) => {
+                base_text.as_str() != old_text
+                    || !new_buffer.read(cx).as_rope().chunks().equals_str(new_text)
+            }
+            Diff::Finalized(FinalizedDiff {
+                base_text,
+                new_buffer,
+                ..
+            }) => {
+                base_text.as_str() != old_text
+                    || !new_buffer.read(cx).as_rope().chunks().equals_str(new_text)
+            }
+        }
+    }
 }

 pub struct PendingDiff {
    multibuffer: Entity<MultiBuffer>,
    base_text: Arc<String>,
-    buffer: Entity<Buffer>,
+    new_buffer: Entity<Buffer>,
    diff: Entity<BufferDiff>,
    revealed_ranges: Vec<Range<Anchor>>,
    _subscription: Subscription,
@@ -187,7 +200,7 @@ pub struct PendingDiff {

 impl PendingDiff {
    pub fn update(&mut self, cx: &mut Context<Diff>) {
-        let buffer = self.buffer.clone();
+        let buffer = self.new_buffer.clone();
        let buffer_diff = self.diff.clone();
        let base_text = self.base_text.clone();
        self.update_diff = cx.spawn(async move |diff, cx| {
@@ -204,7 +217,10 @@ impl PendingDiff {
            )
            .await?;
            buffer_diff.update(cx, |diff, cx| {
-                diff.set_snapshot(diff_snapshot, &text_snapshot, cx)
+                diff.set_snapshot(diff_snapshot.clone(), &text_snapshot, cx);
+                diff.secondary_diff().unwrap().update(cx, |diff, cx| {
+                    diff.set_snapshot(diff_snapshot.clone(), &text_snapshot, cx);
+                });
            })?;
            diff.update(cx, |diff, cx| {
                if let Diff::Pending(diff) = diff {
@@ -222,10 +238,10 @@ impl PendingDiff {
    fn finalize(&self, cx: &mut Context<Diff>) -> FinalizedDiff {
        let ranges = self.excerpt_ranges(cx);
        let base_text = self.base_text.clone();
-        let language_registry = self.buffer.read(cx).language_registry();
+        let language_registry = self.new_buffer.read(cx).language_registry();

        let path = self
-            .buffer
+            .new_buffer
            .read(cx)
            .file()
            .map(|file| file.path().as_ref())
@@ -234,12 +250,12 @@ impl PendingDiff {

        // Replace the buffer in the multibuffer with the snapshot
        let buffer = cx.new(|cx| {
-            let language = self.buffer.read(cx).language().cloned();
+            let language = self.new_buffer.read(cx).language().cloned();
            let buffer = TextBuffer::new_normalized(
                0,
                cx.entity_id().as_non_zero_u64().into(),
-                self.buffer.read(cx).line_ending(),
-                self.buffer.read(cx).as_rope().clone(),
+                self.new_buffer.read(cx).line_ending(),
+                self.new_buffer.read(cx).as_rope().clone(),
            );
            let mut buffer = Buffer::build(buffer, None, Capability::ReadWrite);
            buffer.set_language(language, cx);
@@ -275,7 +291,9 @@ impl PendingDiff {

        FinalizedDiff {
            path,
+            base_text: self.base_text.clone(),
            multibuffer: self.multibuffer.clone(),
+            new_buffer: self.new_buffer.clone(),
            _update_diff: update_diff,
        }
    }
@@ -284,8 +302,8 @@ impl PendingDiff {
        let ranges = self.excerpt_ranges(cx);
        self.multibuffer.update(cx, |multibuffer, cx| {
            multibuffer.set_excerpts_for_path(
-                PathKey::for_buffer(&self.buffer, cx),
-                self.buffer.clone(),
+                PathKey::for_buffer(&self.new_buffer, cx),
+                self.new_buffer.clone(),
                ranges,
                editor::DEFAULT_MULTIBUFFER_CONTEXT,
                cx,
@@ -297,7 +315,7 @@ impl PendingDiff {
    }

    fn excerpt_ranges(&self, cx: &App) -> Vec<Range<Point>> {
-        let buffer = self.buffer.read(cx);
+        let buffer = self.new_buffer.read(cx);
        let diff = self.diff.read(cx);
        let mut ranges = diff
            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
@@ -331,6 +349,8 @@ impl PendingDiff {

 pub struct FinalizedDiff {
    path: PathBuf,
+    base_text: Arc<String>,
+    new_buffer: Entity<Buffer>,
    multibuffer: Entity<MultiBuffer>,
    _update_diff: Task<Result<()>>,
 }
@@ -384,3 +404,21 @@ async fn build_buffer_diff(
        diff
    })
 }
+
+#[cfg(test)]
+mod tests {
+    use gpui::{AppContext as _, TestAppContext};
+    use language::Buffer;
+
+    use crate::Diff;
+
+    #[gpui::test]
+    async fn test_pending_diff(cx: &mut TestAppContext) {
+        let buffer = cx.new(|cx| Buffer::local("hello!", cx));
+        let _diff = cx.new(|cx| Diff::new(buffer.clone(), cx));
+        buffer.update(cx, |buffer, cx| {
+            buffer.set_text("HELLO!", cx);
+        });
+        cx.run_until_parked();
+    }
+}
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -5,7 +5,7 @@ use prompt_store::{PromptId, UserPromptId};
 use serde::{Deserialize, Serialize};
 use std::{
    fmt,
-    ops::Range,
+    ops::RangeInclusive,
    path::{Path, PathBuf},
    str::FromStr,
 };
@@ -17,13 +17,14 @@ pub enum MentionUri {
    File {
        abs_path: PathBuf,
    },
+    PastedImage,
    Directory {
        abs_path: PathBuf,
    },
    Symbol {
-        path: PathBuf,
+        abs_path: PathBuf,
        name: String,
-        line_range: Range<u32>,
+        line_range: RangeInclusive<u32>,
    },
    Thread {
        id: acp::SessionId,
@@ -38,8 +39,9 @@ pub enum MentionUri {
        name: String,
    },
    Selection {
-        path: PathBuf,
-        line_range: Range<u32>,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        abs_path: Option<PathBuf>,
+        line_range: RangeInclusive<u32>,
    },
    Fetch {
        url: Url,
@@ -48,36 +50,44 @@ pub enum MentionUri {

 impl MentionUri {
    pub fn parse(input: &str) -> Result<Self> {
+        fn parse_line_range(fragment: &str) -> Result<RangeInclusive<u32>> {
+            let range = fragment
+                .strip_prefix("L")
+                .context("Line range must start with \"L\"")?;
+            let (start, end) = range
+                .split_once(":")
+                .context("Line range must use colon as separator")?;
+            let range = start
+                .parse::<u32>()
+                .context("Parsing line range start")?
+                .checked_sub(1)
+                .context("Line numbers should be 1-based")?
+                ..=end
+                    .parse::<u32>()
+                    .context("Parsing line range end")?
+                    .checked_sub(1)
+                    .context("Line numbers should be 1-based")?;
+            Ok(range)
+        }
+
        let url = url::Url::parse(input)?;
        let path = url.path();
        match url.scheme() {
            "file" => {
                let path = url.to_file_path().ok().context("Extracting file path")?;
                if let Some(fragment) = url.fragment() {
-                    let range = fragment
-                        .strip_prefix("L")
-                        .context("Line range must start with \"L\"")?;
-                    let (start, end) = range
-                        .split_once(":")
-                        .context("Line range must use colon as separator")?;
-                    let line_range = start
-                        .parse::<u32>()
-                        .context("Parsing line range start")?
-                        .checked_sub(1)
-                        .context("Line numbers should be 1-based")?
-                        ..end
-                            .parse::<u32>()
-                            .context("Parsing line range end")?
-                            .checked_sub(1)
-                            .context("Line numbers should be 1-based")?;
+                    let line_range = parse_line_range(fragment)?;
                    if let Some(name) = single_query_param(&url, "symbol")? {
                        Ok(Self::Symbol {
                            name,
-                            path,
+                            abs_path: path,
                            line_range,
                        })
                    } else {
-                        Ok(Self::Selection { path, line_range })
+                        Ok(Self::Selection {
+                            abs_path: Some(path),
+                            line_range,
+                        })
                    }
                } else if input.ends_with("/") {
                    Ok(Self::Directory { abs_path: path })
@@ -105,6 +115,17 @@ impl MentionUri {
                        id: rule_id.into(),
                        name,
                    })
+                } else if path.starts_with("/agent/pasted-image") {
+                    Ok(Self::PastedImage)
+                } else if path.starts_with("/agent/untitled-buffer") {
+                    let fragment = url
+                        .fragment()
+                        .context("Missing fragment for untitled buffer selection")?;
+                    let line_range = parse_line_range(fragment)?;
+                    Ok(Self::Selection {
+                        abs_path: None,
+                        line_range,
+                    })
                } else {
                    bail!("invalid zed url: {:?}", input);
                }
@@ -121,13 +142,16 @@ impl MentionUri {
                .unwrap_or_default()
                .to_string_lossy()
                .into_owned(),
+            MentionUri::PastedImage => "Image".to_string(),
            MentionUri::Symbol { name, .. } => name.clone(),
            MentionUri::Thread { name, .. } => name.clone(),
            MentionUri::TextThread { name, .. } => name.clone(),
            MentionUri::Rule { name, .. } => name.clone(),
            MentionUri::Selection {
-                path, line_range, ..
-            } => selection_name(path, line_range),
+                abs_path: path,
+                line_range,
+                ..
+            } => selection_name(path.as_deref(), line_range),
            MentionUri::Fetch { url } => url.to_string(),
        }
    }
@@ -137,6 +161,7 @@ impl MentionUri {
            MentionUri::File { abs_path } => {
                FileIcons::get_icon(abs_path, cx).unwrap_or_else(|| IconName::File.path().into())
            }
+            MentionUri::PastedImage => IconName::Image.path().into(),
            MentionUri::Directory { .. } => FileIcons::get_folder_icon(false, cx)
                .unwrap_or_else(|| IconName::Folder.path().into()),
            MentionUri::Symbol { .. } => IconName::Code.path().into(),
@@ -157,29 +182,40 @@ impl MentionUri {
            MentionUri::File { abs_path } => {
                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 } => {
                Url::from_directory_path(abs_path).expect("mention path should be absolute")
            }
            MentionUri::Symbol {
-                path,
+                abs_path,
                name,
                line_range,
            } => {
-                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
+                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,
-                    line_range.end + 1
+                    line_range.start() + 1,
+                    line_range.end() + 1
                )));
                url
            }
-            MentionUri::Selection { path, line_range } => {
-                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
+            MentionUri::Selection {
+                abs_path: path,
+                line_range,
+            } => {
+                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{}:{}",
-                    line_range.start + 1,
-                    line_range.end + 1
+                    line_range.start() + 1,
+                    line_range.end() + 1
                )));
                url
            }
@@ -191,7 +227,10 @@ impl MentionUri {
            }
            MentionUri::TextThread { path, name } => {
                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path(&format!("/agent/text-thread/{}", path.to_string_lossy()));
+                url.set_path(&format!(
+                    "/agent/text-thread/{}",
+                    path.to_string_lossy().trim_start_matches('/')
+                ));
                url.query_pairs_mut().append_pair("name", name);
                url
            }
@@ -237,12 +276,14 @@ fn single_query_param(url: &Url, name: &'static str) -> Result<Option<String>> {
    }
 }

-pub fn selection_name(path: &Path, line_range: &Range<u32>) -> String {
+pub fn selection_name(path: Option<&Path>, line_range: &RangeInclusive<u32>) -> String {
    format!(
        "{} ({}:{})",
-        path.file_name().unwrap_or_default().display(),
-        line_range.start + 1,
-        line_range.end + 1
+        path.and_then(|path| path.file_name())
+            .unwrap_or("Untitled".as_ref())
+            .display(),
+        *line_range.start() + 1,
+        *line_range.end() + 1
    )
 }

@@ -302,14 +343,14 @@ mod tests {
        let parsed = MentionUri::parse(symbol_uri).unwrap();
        match &parsed {
            MentionUri::Symbol {
-                path,
+                abs_path: path,
                name,
                line_range,
            } => {
                assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
                assert_eq!(name, "MySymbol");
-                assert_eq!(line_range.start, 9);
-                assert_eq!(line_range.end, 19);
+                assert_eq!(line_range.start(), &9);
+                assert_eq!(line_range.end(), &19);
            }
            _ => panic!("Expected Symbol variant"),
        }
@@ -321,16 +362,39 @@ mod tests {
        let selection_uri = uri!("file:///path/to/file.rs#L5:15");
        let parsed = MentionUri::parse(selection_uri).unwrap();
        match &parsed {
-            MentionUri::Selection { path, line_range } => {
-                assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
-                assert_eq!(line_range.start, 4);
-                assert_eq!(line_range.end, 14);
+            MentionUri::Selection {
+                abs_path: path,
+                line_range,
+            } => {
+                assert_eq!(
+                    path.as_ref().unwrap().to_str().unwrap(),
+                    path!("/path/to/file.rs")
+                );
+                assert_eq!(line_range.start(), &4);
+                assert_eq!(line_range.end(), &14);
            }
            _ => panic!("Expected Selection variant"),
        }
        assert_eq!(parsed.to_uri().to_string(), selection_uri);
    }

+    #[test]
+    fn test_parse_untitled_selection_uri() {
+        let selection_uri = uri!("zed:///agent/untitled-buffer#L1:10");
+        let parsed = MentionUri::parse(selection_uri).unwrap();
+        match &parsed {
+            MentionUri::Selection {
+                abs_path: None,
+                line_range,
+            } => {
+                assert_eq!(line_range.start(), &0);
+                assert_eq!(line_range.end(), &9);
+            }
+            _ => panic!("Expected Selection variant without path"),
+        }
+        assert_eq!(parsed.to_uri().to_string(), selection_uri);
+    }
+
    #[test]
    fn test_parse_thread_uri() {
        let thread_uri = "zed:///agent/thread/session123?name=Thread+name";
--- a/crates/acp_tools/Cargo.toml
+++ b/crates/acp_tools/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "acp_tools"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/acp_tools.rs"
+doctest = false
+
+[dependencies]
+agent-client-protocol.workspace = true
+collections.workspace = true
+gpui.workspace = true
+language.workspace= true
+markdown.workspace = true
+project.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace-hack.workspace = true
+workspace.workspace = true
--- a/crates/acp_tools/LICENSE-GPL
+++ b/crates/acp_tools/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -0,0 +1,494 @@
+use std::{
+    cell::RefCell,
+    collections::HashSet,
+    fmt::Display,
+    rc::{Rc, Weak},
+    sync::Arc,
+};
+
+use agent_client_protocol as acp;
+use collections::HashMap;
+use gpui::{
+    App, Empty, Entity, EventEmitter, FocusHandle, Focusable, Global, ListAlignment, ListState,
+    StyleRefinement, Subscription, Task, TextStyleRefinement, Window, actions, list, prelude::*,
+};
+use language::LanguageRegistry;
+use markdown::{CodeBlockRenderer, Markdown, MarkdownElement, MarkdownStyle};
+use project::Project;
+use settings::Settings;
+use theme::ThemeSettings;
+use ui::prelude::*;
+use util::ResultExt as _;
+use workspace::{Item, Workspace};
+
+actions!(dev, [OpenAcpLogs]);
+
+pub fn init(cx: &mut App) {
+    cx.observe_new(
+        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
+            workspace.register_action(|workspace, _: &OpenAcpLogs, window, cx| {
+                let acp_tools =
+                    Box::new(cx.new(|cx| AcpTools::new(workspace.project().clone(), cx)));
+                workspace.add_item_to_active_pane(acp_tools, None, true, window, cx);
+            });
+        },
+    )
+    .detach();
+}
+
+struct GlobalAcpConnectionRegistry(Entity<AcpConnectionRegistry>);
+
+impl Global for GlobalAcpConnectionRegistry {}
+
+#[derive(Default)]
+pub struct AcpConnectionRegistry {
+    active_connection: RefCell<Option<ActiveConnection>>,
+}
+
+struct ActiveConnection {
+    server_name: SharedString,
+    connection: Weak<acp::ClientSideConnection>,
+}
+
+impl AcpConnectionRegistry {
+    pub fn default_global(cx: &mut App) -> Entity<Self> {
+        if cx.has_global::<GlobalAcpConnectionRegistry>() {
+            cx.global::<GlobalAcpConnectionRegistry>().0.clone()
+        } else {
+            let registry = cx.new(|_cx| AcpConnectionRegistry::default());
+            cx.set_global(GlobalAcpConnectionRegistry(registry.clone()));
+            registry
+        }
+    }
+
+    pub fn set_active_connection(
+        &self,
+        server_name: impl Into<SharedString>,
+        connection: &Rc<acp::ClientSideConnection>,
+        cx: &mut Context<Self>,
+    ) {
+        self.active_connection.replace(Some(ActiveConnection {
+            server_name: server_name.into(),
+            connection: Rc::downgrade(connection),
+        }));
+        cx.notify();
+    }
+}
+
+struct AcpTools {
+    project: Entity<Project>,
+    focus_handle: FocusHandle,
+    expanded: HashSet<usize>,
+    watched_connection: Option<WatchedConnection>,
+    connection_registry: Entity<AcpConnectionRegistry>,
+    _subscription: Subscription,
+}
+
+struct WatchedConnection {
+    server_name: SharedString,
+    messages: Vec<WatchedConnectionMessage>,
+    list_state: ListState,
+    connection: Weak<acp::ClientSideConnection>,
+    incoming_request_methods: HashMap<i32, Arc<str>>,
+    outgoing_request_methods: HashMap<i32, Arc<str>>,
+    _task: Task<()>,
+}
+
+impl AcpTools {
+    fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
+        let connection_registry = AcpConnectionRegistry::default_global(cx);
+
+        let subscription = cx.observe(&connection_registry, |this, _, cx| {
+            this.update_connection(cx);
+            cx.notify();
+        });
+
+        let mut this = Self {
+            project,
+            focus_handle: cx.focus_handle(),
+            expanded: HashSet::default(),
+            watched_connection: None,
+            connection_registry,
+            _subscription: subscription,
+        };
+        this.update_connection(cx);
+        this
+    }
+
+    fn update_connection(&mut self, cx: &mut Context<Self>) {
+        let active_connection = self.connection_registry.read(cx).active_connection.borrow();
+        let Some(active_connection) = active_connection.as_ref() else {
+            return;
+        };
+
+        if let Some(watched_connection) = self.watched_connection.as_ref() {
+            if Weak::ptr_eq(
+                &watched_connection.connection,
+                &active_connection.connection,
+            ) {
+                return;
+            }
+        }
+
+        if let Some(connection) = active_connection.connection.upgrade() {
+            let mut receiver = connection.subscribe();
+            let task = cx.spawn(async move |this, cx| {
+                while let Ok(message) = receiver.recv().await {
+                    this.update(cx, |this, cx| {
+                        this.push_stream_message(message, cx);
+                    })
+                    .ok();
+                }
+            });
+
+            self.watched_connection = Some(WatchedConnection {
+                server_name: active_connection.server_name.clone(),
+                messages: vec![],
+                list_state: ListState::new(0, ListAlignment::Bottom, px(2048.)),
+                connection: active_connection.connection.clone(),
+                incoming_request_methods: HashMap::default(),
+                outgoing_request_methods: HashMap::default(),
+                _task: task,
+            });
+        }
+    }
+
+    fn push_stream_message(&mut self, stream_message: acp::StreamMessage, cx: &mut Context<Self>) {
+        let Some(connection) = self.watched_connection.as_mut() else {
+            return;
+        };
+        let language_registry = self.project.read(cx).languages().clone();
+        let index = connection.messages.len();
+
+        let (request_id, method, message_type, params) = match stream_message.message {
+            acp::StreamMessageContent::Request { id, method, params } => {
+                let method_map = match stream_message.direction {
+                    acp::StreamMessageDirection::Incoming => {
+                        &mut connection.incoming_request_methods
+                    }
+                    acp::StreamMessageDirection::Outgoing => {
+                        &mut connection.outgoing_request_methods
+                    }
+                };
+
+                method_map.insert(id, method.clone());
+                (Some(id), method.into(), MessageType::Request, Ok(params))
+            }
+            acp::StreamMessageContent::Response { id, result } => {
+                let method_map = match stream_message.direction {
+                    acp::StreamMessageDirection::Incoming => {
+                        &mut connection.outgoing_request_methods
+                    }
+                    acp::StreamMessageDirection::Outgoing => {
+                        &mut connection.incoming_request_methods
+                    }
+                };
+
+                if let Some(method) = method_map.remove(&id) {
+                    (Some(id), method.into(), MessageType::Response, result)
+                } else {
+                    (
+                        Some(id),
+                        "[unrecognized response]".into(),
+                        MessageType::Response,
+                        result,
+                    )
+                }
+            }
+            acp::StreamMessageContent::Notification { method, params } => {
+                (None, method.into(), MessageType::Notification, Ok(params))
+            }
+        };
+
+        let message = WatchedConnectionMessage {
+            name: method,
+            message_type,
+            request_id,
+            direction: stream_message.direction,
+            collapsed_params_md: match params.as_ref() {
+                Ok(params) => params
+                    .as_ref()
+                    .map(|params| collapsed_params_md(params, &language_registry, cx)),
+                Err(err) => {
+                    if let Ok(err) = &serde_json::to_value(err) {
+                        Some(collapsed_params_md(&err, &language_registry, cx))
+                    } else {
+                        None
+                    }
+                }
+            },
+
+            expanded_params_md: None,
+            params,
+        };
+
+        connection.messages.push(message);
+        connection.list_state.splice(index..index, 1);
+        cx.notify();
+    }
+
+    fn render_message(
+        &mut self,
+        index: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> AnyElement {
+        let Some(connection) = self.watched_connection.as_ref() else {
+            return Empty.into_any();
+        };
+
+        let Some(message) = connection.messages.get(index) else {
+            return Empty.into_any();
+        };
+
+        let base_size = TextSize::Editor.rems(cx);
+
+        let theme_settings = ThemeSettings::get_global(cx);
+        let text_style = window.text_style();
+
+        let colors = cx.theme().colors();
+        let expanded = self.expanded.contains(&index);
+
+        v_flex()
+            .w_full()
+            .px_4()
+            .py_3()
+            .border_color(colors.border)
+            .border_b_1()
+            .gap_2()
+            .items_start()
+            .font_buffer(cx)
+            .text_size(base_size)
+            .id(index)
+            .group("message")
+            .hover(|this| this.bg(colors.element_background.opacity(0.5)))
+            .on_click(cx.listener(move |this, _, _, cx| {
+                if this.expanded.contains(&index) {
+                    this.expanded.remove(&index);
+                } else {
+                    this.expanded.insert(index);
+                    let Some(connection) = &mut this.watched_connection else {
+                        return;
+                    };
+                    let Some(message) = connection.messages.get_mut(index) else {
+                        return;
+                    };
+                    message.expanded(this.project.read(cx).languages().clone(), cx);
+                    connection.list_state.scroll_to_reveal_item(index);
+                }
+                cx.notify()
+            }))
+            .child(
+                h_flex()
+                    .w_full()
+                    .gap_2()
+                    .items_center()
+                    .flex_shrink_0()
+                    .child(match message.direction {
+                        acp::StreamMessageDirection::Incoming => {
+                            ui::Icon::new(ui::IconName::ArrowDown).color(Color::Error)
+                        }
+                        acp::StreamMessageDirection::Outgoing => {
+                            ui::Icon::new(ui::IconName::ArrowUp).color(Color::Success)
+                        }
+                    })
+                    .child(
+                        Label::new(message.name.clone())
+                            .buffer_font(cx)
+                            .color(Color::Muted),
+                    )
+                    .child(div().flex_1())
+                    .child(
+                        div()
+                            .child(ui::Chip::new(message.message_type.to_string()))
+                            .visible_on_hover("message"),
+                    )
+                    .children(
+                        message
+                            .request_id
+                            .map(|req_id| div().child(ui::Chip::new(req_id.to_string()))),
+                    ),
+            )
+            // I'm aware using markdown is a hack. Trying to get something working for the demo.
+            // Will clean up soon!
+            .when_some(
+                if expanded {
+                    message.expanded_params_md.clone()
+                } else {
+                    message.collapsed_params_md.clone()
+                },
+                |this, params| {
+                    this.child(
+                        div().pl_6().w_full().child(
+                            MarkdownElement::new(
+                                params,
+                                MarkdownStyle {
+                                    base_text_style: text_style,
+                                    selection_background_color: colors.element_selection_background,
+                                    syntax: cx.theme().syntax().clone(),
+                                    code_block_overflow_x_scroll: true,
+                                    code_block: StyleRefinement {
+                                        text: Some(TextStyleRefinement {
+                                            font_family: Some(
+                                                theme_settings.buffer_font.family.clone(),
+                                            ),
+                                            font_size: Some((base_size * 0.8).into()),
+                                            ..Default::default()
+                                        }),
+                                        ..Default::default()
+                                    },
+                                    ..Default::default()
+                                },
+                            )
+                            .code_block_renderer(
+                                CodeBlockRenderer::Default {
+                                    copy_button: false,
+                                    copy_button_on_hover: expanded,
+                                    border: false,
+                                },
+                            ),
+                        ),
+                    )
+                },
+            )
+            .into_any()
+    }
+}
+
+struct WatchedConnectionMessage {
+    name: SharedString,
+    request_id: Option<i32>,
+    direction: acp::StreamMessageDirection,
+    message_type: MessageType,
+    params: Result<Option<serde_json::Value>, acp::Error>,
+    collapsed_params_md: Option<Entity<Markdown>>,
+    expanded_params_md: Option<Entity<Markdown>>,
+}
+
+impl WatchedConnectionMessage {
+    fn expanded(&mut self, language_registry: Arc<LanguageRegistry>, cx: &mut App) {
+        let params_md = match &self.params {
+            Ok(Some(params)) => Some(expanded_params_md(params, &language_registry, cx)),
+            Err(err) => {
+                if let Some(err) = &serde_json::to_value(err).log_err() {
+                    Some(expanded_params_md(&err, &language_registry, cx))
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        };
+        self.expanded_params_md = params_md;
+    }
+}
+
+fn collapsed_params_md(
+    params: &serde_json::Value,
+    language_registry: &Arc<LanguageRegistry>,
+    cx: &mut App,
+) -> Entity<Markdown> {
+    let params_json = serde_json::to_string(params).unwrap_or_default();
+    let mut spaced_out_json = String::with_capacity(params_json.len() + params_json.len() / 4);
+
+    for ch in params_json.chars() {
+        match ch {
+            '{' => spaced_out_json.push_str("{ "),
+            '}' => spaced_out_json.push_str(" }"),
+            ':' => spaced_out_json.push_str(": "),
+            ',' => spaced_out_json.push_str(", "),
+            c => spaced_out_json.push(c),
+        }
+    }
+
+    let params_md = format!("```json\n{}\n```", spaced_out_json);
+    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
+}
+
+fn expanded_params_md(
+    params: &serde_json::Value,
+    language_registry: &Arc<LanguageRegistry>,
+    cx: &mut App,
+) -> Entity<Markdown> {
+    let params_json = serde_json::to_string_pretty(params).unwrap_or_default();
+    let params_md = format!("```json\n{}\n```", params_json);
+    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
+}
+
+enum MessageType {
+    Request,
+    Response,
+    Notification,
+}
+
+impl Display for MessageType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            MessageType::Request => write!(f, "Request"),
+            MessageType::Response => write!(f, "Response"),
+            MessageType::Notification => write!(f, "Notification"),
+        }
+    }
+}
+
+enum AcpToolsEvent {}
+
+impl EventEmitter<AcpToolsEvent> for AcpTools {}
+
+impl Item for AcpTools {
+    type Event = AcpToolsEvent;
+
+    fn tab_content_text(&self, _detail: usize, _cx: &App) -> ui::SharedString {
+        format!(
+            "ACP: {}",
+            self.watched_connection
+                .as_ref()
+                .map_or("Disconnected", |connection| &connection.server_name)
+        )
+        .into()
+    }
+
+    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
+        Some(ui::Icon::new(IconName::Thread))
+    }
+}
+
+impl Focusable for AcpTools {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for AcpTools {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .track_focus(&self.focus_handle)
+            .size_full()
+            .bg(cx.theme().colors().editor_background)
+            .child(match self.watched_connection.as_ref() {
+                Some(connection) => {
+                    if connection.messages.is_empty() {
+                        h_flex()
+                            .size_full()
+                            .justify_center()
+                            .items_center()
+                            .child("No messages recorded yet")
+                            .into_any()
+                    } else {
+                        list(
+                            connection.list_state.clone(),
+                            cx.processor(Self::render_message),
+                        )
+                        .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
+                        .flex_grow()
+                        .into_any()
+                    }
+                }
+                None => h_flex()
+                    .size_full()
+                    .justify_center()
+                    .items_center()
+                    .child("No active connection")
+                    .into_any(),
+            })
+    }
+}
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -664,7 +664,7 @@ impl Thread {
    }

    pub fn get_or_init_configured_model(&mut self, cx: &App) -> Option<ConfiguredModel> {
-        if self.configured_model.is_none() {
+        if self.configured_model.is_none() || self.messages.is_empty() {
            self.configured_model = LanguageModelRegistry::read_global(cx).default_model();
        }
        self.configured_model.clone()
@@ -2097,7 +2097,7 @@ impl Thread {
    }

    pub fn summarize(&mut self, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model() else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model(cx) else {
            println!("No thread summary model");
            return;
        };
@@ -2416,7 +2416,7 @@ impl Thread {
        }

        let Some(ConfiguredModel { model, provider }) =
-            LanguageModelRegistry::read_global(cx).thread_summary_model()
+            LanguageModelRegistry::read_global(cx).thread_summary_model(cx)
        else {
            return;
        };
@@ -5410,13 +5410,10 @@ fn main() {{
                    }),
                    cx,
                );
-                registry.set_thread_summary_model(
-                    Some(ConfiguredModel {
-                        provider,
-                        model: model.clone(),
-                    }),
-                    cx,
-                );
+                registry.set_thread_summary_model(Some(ConfiguredModel {
+                    provider,
+                    model: model.clone(),
+                }));
            })
        });

--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -893,8 +893,19 @@ impl ThreadsDatabase {

        let needs_migration_from_heed = mdb_path.exists();

-        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
+        let connection = if *ZED_STATELESS {
            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
+        } else if cfg!(any(feature = "test-support", test)) {
+            // rust stores the name of the test on the current thread.
+            // We use this to automatically create a database that will
+            // be shared within the test (for the test_retrieve_old_thread)
+            // but not with concurrent tests.
+            let thread = std::thread::current();
+            let test_name = thread.name();
+            Connection::open_memory(Some(&format!(
+                "THREAD_FALLBACK_{}",
+                test_name.unwrap_or_default()
+            )))
        } else {
            Connection::open_file(&sqlite_path.to_string_lossy())
        };
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/agent2.rs"

 [features]
 test-support = ["db/test-support"]
+e2e = []

 [lints]
 workspace = true
@@ -60,6 +61,7 @@ sqlez.workspace = true
 task.workspace = true
 telemetry.workspace = true
 terminal.workspace = true
+thiserror.workspace = true
 text.workspace = true
 ui.workspace = true
 util.workspace = true
@@ -72,6 +74,7 @@ zstd.workspace = true

 [dev-dependencies]
 agent = { workspace = true, "features" = ["test-support"] }
+agent_servers = { workspace = true, "features" = ["test-support"] }
 assistant_context = { workspace = true, "features" = ["test-support"] }
 ctor.workspace = true
 client = { workspace = true, "features" = ["test-support"] }
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -2,7 +2,7 @@ use crate::{
    ContextServerRegistry, Thread, ThreadEvent, ThreadsDatabase, ToolCallAuthorization,
    UserMessageContent, templates::Templates,
 };
-use crate::{HistoryStore, TokenUsageUpdated};
+use crate::{HistoryStore, TitleUpdated, TokenUsageUpdated};
 use acp_thread::{AcpThread, AgentModelSelector};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
@@ -180,7 +180,7 @@ impl NativeAgent {
        fs: Arc<dyn Fs>,
        cx: &mut AsyncApp,
    ) -> Result<Entity<NativeAgent>> {
-        log::info!("Creating new NativeAgent");
+        log::debug!("Creating new NativeAgent");

        let project_context = cx
            .update(|cx| Self::build_project_context(&project, prompt_store.as_ref(), cx))?
@@ -228,7 +228,7 @@ impl NativeAgent {
    ) -> Entity<AcpThread> {
        let connection = Rc::new(NativeAgentConnection(cx.entity()));
        let registry = LanguageModelRegistry::read_global(cx);
-        let summarization_model = registry.thread_summary_model().map(|c| c.model);
+        let summarization_model = registry.thread_summary_model(cx).map(|c| c.model);

        thread_handle.update(cx, |thread, cx| {
            thread.set_summarization_model(summarization_model, cx);
@@ -240,19 +240,23 @@ impl NativeAgent {
        let title = thread.title();
        let project = thread.project.clone();
        let action_log = thread.action_log.clone();
-        let acp_thread = cx.new(|_cx| {
+        let prompt_capabilities_rx = thread.prompt_capabilities_rx.clone();
+        let acp_thread = cx.new(|cx| {
            acp_thread::AcpThread::new(
                title,
                connection,
                project.clone(),
                action_log.clone(),
                session_id.clone(),
+                prompt_capabilities_rx,
+                cx,
            )
        });
        let subscriptions = vec![
            cx.observe_release(&acp_thread, |this, acp_thread, _cx| {
                this.sessions.remove(acp_thread.session_id());
            }),
+            cx.subscribe(&thread_handle, Self::handle_thread_title_updated),
            cx.subscribe(&thread_handle, Self::handle_thread_token_usage_updated),
            cx.observe(&thread_handle, move |this, thread, cx| {
                this.save_thread(thread, cx)
@@ -441,6 +445,26 @@ impl NativeAgent {
        })
    }

+    fn handle_thread_title_updated(
+        &mut self,
+        thread: Entity<Thread>,
+        _: &TitleUpdated,
+        cx: &mut Context<Self>,
+    ) {
+        let session_id = thread.read(cx).id();
+        let Some(session) = self.sessions.get(session_id) else {
+            return;
+        };
+        let thread = thread.downgrade();
+        let acp_thread = session.acp_thread.clone();
+        cx.spawn(async move |_, cx| {
+            let title = thread.read_with(cx, |thread, _| thread.title())?;
+            let task = acp_thread.update(cx, |acp_thread, cx| acp_thread.set_title(title, cx))?;
+            task.await
+        })
+        .detach_and_log_err(cx);
+    }
+
    fn handle_thread_token_usage_updated(
        &mut self,
        thread: Entity<Thread>,
@@ -500,7 +524,7 @@ impl NativeAgent {

        let registry = LanguageModelRegistry::read_global(cx);
        let default_model = registry.default_model().map(|m| m.model);
-        let summarization_model = registry.thread_summary_model().map(|m| m.model);
+        let summarization_model = registry.thread_summary_model(cx).map(|m| m.model);

        for session in self.sessions.values_mut() {
            session.thread.update(cx, |thread, cx| {
@@ -717,10 +741,6 @@ impl NativeAgentConnection {
                                    thread.update_tool_call(update, cx)
                                })??;
                            }
-                            ThreadEvent::TitleUpdate(title) => {
-                                acp_thread
-                                    .update(cx, |thread, cx| thread.update_title(title, cx))??;
-                            }
                            ThreadEvent::Retry(status) => {
                                acp_thread.update(cx, |thread, cx| {
                                    thread.update_retry_status(status, cx)
@@ -739,7 +759,7 @@ impl NativeAgentConnection {
                }
            }

-            log::info!("Response stream completed");
+            log::debug!("Response stream completed");
            anyhow::Ok(acp::PromptResponse {
                stop_reason: acp::StopReason::EndTurn,
            })
@@ -764,7 +784,7 @@ impl AgentModelSelector for NativeAgentConnection {
        model_id: acp_thread::AgentModelId,
        cx: &mut App,
    ) -> Task<Result<()>> {
-        log::info!("Setting model for session {}: {}", session_id, model_id);
+        log::debug!("Setting model for session {}: {}", session_id, model_id);
        let Some(thread) = self
            .0
            .read(cx)
@@ -835,12 +855,11 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
        cx: &mut App,
    ) -> Task<Result<Entity<acp_thread::AcpThread>>> {
        let agent = self.0.clone();
-        log::info!("Creating new thread for project at: {:?}", cwd);
+        log::debug!("Creating new thread for project at: {:?}", cwd);

        cx.spawn(async move |cx| {
            log::debug!("Starting thread creation in async context");

-            let action_log = cx.new(|_cx| ActionLog::new(project.clone()))?;
            // Create Thread
            let thread = agent.update(
                cx,
@@ -856,20 +875,16 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                            .models
                            .model_from_id(&LanguageModels::model_id(&default_model.model))
                    });
-
-                    let thread = cx.new(|cx| {
+                    Ok(cx.new(|cx| {
                        Thread::new(
                            project.clone(),
                            agent.project_context.clone(),
                            agent.context_server_registry.clone(),
-                            action_log.clone(),
                            agent.templates.clone(),
                            default_model,
                            cx,
                        )
-                    });
-
-                    Ok(thread)
+                    }))
                },
            )??;
            agent.update(cx, |agent, cx| agent.register_session(thread, cx))
@@ -890,11 +905,10 @@ impl acp_thread::AgentConnection for NativeAgentConnection {

    fn prompt(
        &self,
-        id: Option<acp_thread::UserMessageId>,
        params: acp::PromptRequest,
        cx: &mut App,
    ) -> Task<Result<acp::PromptResponse>> {
-        let id = id.expect("UserMessageId is required");
+        let id = params.prompt_id.expect("UserMessageId is required");
        let session_id = params.session_id.clone();
        log::info!("Received prompt request for session: {}", session_id);
        log::debug!("Prompt blocks count: {}", params.prompt.len());
@@ -905,7 +919,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                .into_iter()
                .map(Into::into)
                .collect::<Vec<_>>();
-            log::info!("Converted prompt to message: {} chars", content.len());
+            log::debug!("Converted prompt to message: {} chars", content.len());
            log::debug!("Message id: {:?}", id);
            log::debug!("Message content: {:?}", content);

@@ -913,18 +927,10 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
        })
    }

-    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        acp::PromptCapabilities {
-            image: true,
-            audio: false,
-            embedded_context: true,
-        }
-    }
-
    fn resume(
        &self,
        session_id: &acp::SessionId,
-        _cx: &mut App,
+        _cx: &App,
    ) -> Option<Rc<dyn acp_thread::AgentSessionResume>> {
        Some(Rc::new(NativeAgentSessionResume {
            connection: self.clone(),
@@ -941,12 +947,12 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
        });
    }

-    fn session_editor(
+    fn rewind(
        &self,
        session_id: &agent_client_protocol::SessionId,
-        cx: &mut App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionEditor>> {
-        self.0.update(cx, |agent, _cx| {
+        cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionRewind>> {
+        self.0.read_with(cx, |agent, _cx| {
            agent.sessions.get(session_id).map(|session| {
                Rc::new(NativeAgentSessionEditor {
                    thread: session.thread.clone(),
@@ -956,6 +962,17 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
        })
    }

+    fn set_title(
+        &self,
+        session_id: &acp::SessionId,
+        _cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionSetTitle>> {
+        Some(Rc::new(NativeAgentSessionSetTitle {
+            connection: self.clone(),
+            session_id: session_id.clone(),
+        }) as _)
+    }
+
    fn telemetry(&self) -> Option<Rc<dyn acp_thread::AgentTelemetry>> {
        Some(Rc::new(self.clone()) as Rc<dyn acp_thread::AgentTelemetry>)
    }
@@ -991,10 +1008,10 @@ struct NativeAgentSessionEditor {
    acp_thread: WeakEntity<AcpThread>,
 }

-impl acp_thread::AgentSessionEditor for NativeAgentSessionEditor {
-    fn truncate(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
+impl acp_thread::AgentSessionRewind for NativeAgentSessionEditor {
+    fn rewind(&self, message_id: acp::PromptId, cx: &mut App) -> Task<Result<()>> {
        match self.thread.update(cx, |thread, cx| {
-            thread.truncate(message_id.clone(), cx)?;
+            thread.rewind(message_id.clone(), cx)?;
            Ok(thread.latest_token_usage())
        }) {
            Ok(usage) => {
@@ -1024,6 +1041,22 @@ impl acp_thread::AgentSessionResume for NativeAgentSessionResume {
    }
 }

+struct NativeAgentSessionSetTitle {
+    connection: NativeAgentConnection,
+    session_id: acp::SessionId,
+}
+
+impl acp_thread::AgentSessionSetTitle for NativeAgentSessionSetTitle {
+    fn run(&self, title: SharedString, cx: &mut App) -> Task<Result<()>> {
+        let Some(session) = self.connection.0.read(cx).sessions.get(&self.session_id) else {
+            return Task::ready(Err(anyhow!("session not found")));
+        };
+        let thread = session.thread.clone();
+        thread.update(cx, |thread, cx| thread.set_title(title, cx));
+        Task::ready(Ok(()))
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use crate::HistoryEntryId;
@@ -1031,6 +1064,7 @@ mod tests {
    use super::*;
    use acp_thread::{
        AgentConnection, AgentModelGroupName, AgentModelId, AgentModelInfo, MentionUri,
+        new_prompt_id,
    };
    use fs::FakeFs;
    use gpui::TestAppContext;
@@ -1269,20 +1303,15 @@ mod tests {
        let model = Arc::new(FakeLanguageModel::default());
        let summary_model = Arc::new(FakeLanguageModel::default());
        thread.update(cx, |thread, cx| {
-            thread.set_model(model, cx);
-            thread.set_summarization_model(Some(summary_model), cx);
+            thread.set_model(model.clone(), cx);
+            thread.set_summarization_model(Some(summary_model.clone()), cx);
        });
        cx.run_until_parked();
        assert_eq!(history_entries(&history_store, cx), vec![]);

-        let model = thread.read_with(cx, |thread, _| thread.model().unwrap().clone());
-        let model = model.as_fake();
-        let summary_model = thread.read_with(cx, |thread, _| {
-            thread.summarization_model().unwrap().clone()
-        });
-        let summary_model = summary_model.as_fake();
        let send = acp_thread.update(cx, |thread, cx| {
            thread.send(
+                new_prompt_id(),
                vec![
                    "What does ".into(),
                    acp::ContentBlock::ResourceLink(acp::ResourceLink {
@@ -1329,6 +1358,8 @@ mod tests {
            )
        });

+        cx.run_until_parked();
+
        // Drop the ACP thread, which should cause the session to be dropped as well.
        cx.update(|_| {
            drop(thread);
@@ -1371,10 +1402,9 @@ mod tests {
        history: &Entity<HistoryStore>,
        cx: &mut TestAppContext,
    ) -> Vec<(HistoryEntryId, String)> {
-        history.read_with(cx, |history, cx| {
+        history.read_with(cx, |history, _| {
            history
-                .entries(cx)
-                .iter()
+                .entries()
                .map(|e| (e.id(), e.title().to_string()))
                .collect::<Vec<_>>()
        })
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -1,5 +1,5 @@
 use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
-use acp_thread::UserMessageId;
+use acp_thread::new_prompt_id;
 use agent::{thread::DetailedSummaryState, thread_store};
 use agent_client_protocol as acp;
 use agent_settings::{AgentProfileId, CompletionMode};
@@ -43,7 +43,7 @@ pub struct DbThread {
    #[serde(default)]
    pub cumulative_token_usage: language_model::TokenUsage,
    #[serde(default)]
-    pub request_token_usage: HashMap<acp_thread::UserMessageId, language_model::TokenUsage>,
+    pub request_token_usage: HashMap<acp::PromptId, language_model::TokenUsage>,
    #[serde(default)]
    pub model: Option<DbLanguageModel>,
    #[serde(default)]
@@ -97,7 +97,7 @@ impl DbThread {
                        content.push(UserMessageContent::Text(msg.context));
                    }

-                    let id = UserMessageId::new();
+                    let id = new_prompt_id();
                    last_user_message_id = Some(id.clone());

                    crate::Message::User(UserMessage {
@@ -266,8 +266,19 @@ impl ThreadsDatabase {
    }

    pub fn new(executor: BackgroundExecutor) -> Result<Self> {
-        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
+        let connection = if *ZED_STATELESS {
            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
+        } else if cfg!(any(feature = "test-support", test)) {
+            // rust stores the name of the test on the current thread.
+            // We use this to automatically create a database that will
+            // be shared within the test (for the test_retrieve_old_thread)
+            // but not with concurrent tests.
+            let thread = std::thread::current();
+            let test_name = thread.name();
+            Connection::open_memory(Some(&format!(
+                "THREAD_FALLBACK_{}",
+                test_name.unwrap_or_default()
+            )))
        } else {
            let threads_dir = paths::data_dir().join("threads");
            std::fs::create_dir_all(&threads_dir)?;
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -10,6 +10,7 @@ use itertools::Itertools;
 use paths::contexts_dir;
 use serde::{Deserialize, Serialize};
 use std::{collections::VecDeque, path::Path, sync::Arc, time::Duration};
+use ui::ElementId;
 use util::ResultExt as _;

 const MAX_RECENTLY_OPENED_ENTRIES: usize = 6;
@@ -68,6 +69,15 @@ pub enum HistoryEntryId {
    TextThread(Arc<Path>),
 }

+impl Into<ElementId> for HistoryEntryId {
+    fn into(self) -> ElementId {
+        match self {
+            HistoryEntryId::AcpThread(session_id) => ElementId::Name(session_id.0.into()),
+            HistoryEntryId::TextThread(path) => ElementId::Path(path),
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 enum SerializedRecentOpen {
    AcpThread(String),
@@ -76,6 +86,7 @@ enum SerializedRecentOpen {

 pub struct HistoryStore {
    threads: Vec<DbThreadMetadata>,
+    entries: Vec<HistoryEntry>,
    context_store: Entity<assistant_context::ContextStore>,
    recently_opened_entries: VecDeque<HistoryEntryId>,
    _subscriptions: Vec<gpui::Subscription>,
@@ -87,7 +98,7 @@ impl HistoryStore {
        context_store: Entity<assistant_context::ContextStore>,
        cx: &mut Context<Self>,
    ) -> Self {
-        let subscriptions = vec![cx.observe(&context_store, |_, _, cx| cx.notify())];
+        let subscriptions = vec![cx.observe(&context_store, |this, _, cx| this.update_entries(cx))];

        cx.spawn(async move |this, cx| {
            let entries = Self::load_recently_opened_entries(cx).await;
@@ -106,6 +117,7 @@ impl HistoryStore {
            context_store,
            recently_opened_entries: VecDeque::default(),
            threads: Vec::default(),
+            entries: Vec::default(),
            _subscriptions: subscriptions,
            _save_recently_opened_entries_task: Task::ready(()),
        }
@@ -171,20 +183,18 @@ impl HistoryStore {
                    }
                }
                this.threads = threads;
-                cx.notify();
+                this.update_entries(cx);
            })
        })
        .detach_and_log_err(cx);
    }

-    pub fn entries(&self, cx: &App) -> Vec<HistoryEntry> {
-        let mut history_entries = Vec::new();
-
+    fn update_entries(&mut self, cx: &mut Context<Self>) {
        #[cfg(debug_assertions)]
        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
-            return history_entries;
+            return;
        }
-
+        let mut history_entries = Vec::new();
        history_entries.extend(self.threads.iter().cloned().map(HistoryEntry::AcpThread));
        history_entries.extend(
            self.context_store
@@ -195,17 +205,12 @@ impl HistoryStore {
        );

        history_entries.sort_unstable_by_key(|entry| std::cmp::Reverse(entry.updated_at()));
-        history_entries
+        self.entries = history_entries;
+        cx.notify()
    }

-    pub fn is_empty(&self, cx: &App) -> bool {
-        self.threads.is_empty()
-            && self
-                .context_store
-                .read(cx)
-                .unordered_contexts()
-                .next()
-                .is_none()
+    pub fn is_empty(&self, _cx: &App) -> bool {
+        self.entries.is_empty()
    }

    pub fn recently_opened_entries(&self, cx: &App) -> Vec<HistoryEntry> {
@@ -345,4 +350,8 @@ impl HistoryStore {
            .retain(|old_entry| old_entry != entry);
        self.save_recently_opened_entries(cx);
    }
+
+    pub fn entries(&self) -> impl Iterator<Item = HistoryEntry> {
+        self.entries.iter().cloned()
+    }
 }
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -3,7 +3,7 @@ use std::{any::Any, path::Path, rc::Rc, sync::Arc};
 use agent_servers::AgentServer;
 use anyhow::Result;
 use fs::Fs;
-use gpui::{App, Entity, Task};
+use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use prompt_store::PromptStore;

@@ -22,16 +22,20 @@ impl NativeAgentServer {
 }

 impl AgentServer for NativeAgentServer {
-    fn name(&self) -> &'static str {
-        "Native Agent"
+    fn telemetry_id(&self) -> &'static str {
+        "zed"
    }

-    fn empty_state_headline(&self) -> &'static str {
-        ""
+    fn name(&self) -> SharedString {
+        "Zed Agent".into()
    }

-    fn empty_state_message(&self) -> &'static str {
-        ""
+    fn empty_state_headline(&self) -> SharedString {
+        self.name()
+    }
+
+    fn empty_state_message(&self) -> SharedString {
+        "".into()
    }

    fn logo(&self) -> ui::IconName {
@@ -44,7 +48,7 @@ impl AgentServer for NativeAgentServer {
        project: &Entity<Project>,
        cx: &mut App,
    ) -> Task<Result<Rc<dyn acp_thread::AgentConnection>>> {
-        log::info!(
+        log::debug!(
            "NativeAgentServer::connect called for path: {:?}",
            _root_dir
        );
@@ -63,7 +67,7 @@ impl AgentServer for NativeAgentServer {

            // Create the connection wrapper
            let connection = NativeAgentConnection(agent);
-            log::info!("NativeAgentServer connection established successfully");
+            log::debug!("NativeAgentServer connection established successfully");

            Ok(Rc::new(connection) as Rc<dyn acp_thread::AgentConnection>)
        })
@@ -73,3 +77,52 @@ impl AgentServer for NativeAgentServer {
        self
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use assistant_context::ContextStore;
+    use gpui::AppContext;
+
+    agent_servers::e2e_tests::common_e2e_tests!(
+        async |fs, project, cx| {
+            let auth = cx.update(|cx| {
+                prompt_store::init(cx);
+                terminal::init(cx);
+
+                let registry = language_model::LanguageModelRegistry::read_global(cx);
+                let auth = registry
+                    .provider(&language_model::ANTHROPIC_PROVIDER_ID)
+                    .unwrap()
+                    .authenticate(cx);
+
+                cx.spawn(async move |_| auth.await)
+            });
+
+            auth.await.unwrap();
+
+            cx.update(|cx| {
+                let registry = language_model::LanguageModelRegistry::global(cx);
+
+                registry.update(cx, |registry, cx| {
+                    registry.select_default_model(
+                        Some(&language_model::SelectedModel {
+                            provider: language_model::ANTHROPIC_PROVIDER_ID,
+                            model: language_model::LanguageModelId("claude-sonnet-4-latest".into()),
+                        }),
+                        cx,
+                    );
+                });
+            });
+
+            let history = cx.update(|cx| {
+                let context_store = cx.new(move |cx| ContextStore::fake(project.clone(), cx));
+                cx.new(move |cx| HistoryStore::new(context_store, cx))
+            });
+
+            NativeAgentServer::new(fs.clone(), history)
+        },
+        allow_option_id = "allow"
+    );
+}
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
--- a/crates/agent2/src/tests/test_tools.rs
+++ b/crates/agent2/src/tests/test_tools.rs
@@ -16,11 +16,11 @@ impl AgentTool for EchoTool {
    type Input = EchoToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "echo".into()
+    fn name() -> &'static str {
+        "echo"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Other
    }

@@ -51,8 +51,8 @@ impl AgentTool for DelayTool {
    type Input = DelayToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "delay".into()
+    fn name() -> &'static str {
+        "delay"
    }

    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
@@ -63,7 +63,7 @@ impl AgentTool for DelayTool {
        }
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Other
    }

@@ -92,11 +92,11 @@ impl AgentTool for ToolRequiringPermission {
    type Input = ToolRequiringPermissionInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "tool_requiring_permission".into()
+    fn name() -> &'static str {
+        "tool_requiring_permission"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Other
    }

@@ -127,11 +127,11 @@ impl AgentTool for InfiniteTool {
    type Input = InfiniteToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "infinite".into()
+    fn name() -> &'static str {
+        "infinite"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Other
    }

@@ -178,11 +178,11 @@ impl AgentTool for WordListTool {
    type Input = WordListInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "word_list".into()
+    fn name() -> &'static str {
+        "word_list"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Other
    }

--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
--- a/crates/agent2/src/tools.rs
+++ b/crates/agent2/src/tools.rs
@@ -16,6 +16,29 @@ mod terminal_tool;
 mod thinking_tool;
 mod web_search_tool;

+/// A list of all built in tool names, for use in deduplicating MCP tool names
+pub fn default_tool_names() -> impl Iterator<Item = &'static str> {
+    [
+        CopyPathTool::name(),
+        CreateDirectoryTool::name(),
+        DeletePathTool::name(),
+        DiagnosticsTool::name(),
+        EditFileTool::name(),
+        FetchTool::name(),
+        FindPathTool::name(),
+        GrepTool::name(),
+        ListDirectoryTool::name(),
+        MovePathTool::name(),
+        NowTool::name(),
+        OpenTool::name(),
+        ReadFileTool::name(),
+        TerminalTool::name(),
+        ThinkingTool::name(),
+        WebSearchTool::name(),
+    ]
+    .into_iter()
+}
+
 pub use context_server_registry::*;
 pub use copy_path_tool::*;
 pub use create_directory_tool::*;
@@ -33,3 +56,5 @@ pub use read_file_tool::*;
 pub use terminal_tool::*;
 pub use thinking_tool::*;
 pub use web_search_tool::*;
+
+use crate::AgentTool;
--- a/crates/agent2/src/tools/copy_path_tool.rs
+++ b/crates/agent2/src/tools/copy_path_tool.rs
@@ -1,23 +1,18 @@
 use crate::{AgentTool, ToolCallEventStream};
 use agent_client_protocol::ToolKind;
 use anyhow::{Context as _, Result, anyhow};
-use gpui::{App, AppContext, Entity, SharedString, Task};
+use gpui::{App, AppContext, Entity, Task};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use util::markdown::MarkdownInlineCode;

-/// Copies a file or directory in the project, and returns confirmation that the
-/// copy succeeded.
-///
+/// Copies a file or directory in the project, and returns confirmation that the copy succeeded.
 /// 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.
+/// 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.
@@ -33,12 +28,10 @@ pub struct CopyPathToolInput {
    /// You can copy the first file by providing a source_path of "directory1/a/something.txt"
    /// </example>
    pub source_path: String,
-
    /// The destination path where the file or directory should be copied to.
    ///
    /// <example>
-    /// To copy "directory1/a/something.txt" to "directory2/b/copy.txt",
-    /// provide a destination_path of "directory2/b/copy.txt"
+    /// To copy "directory1/a/something.txt" to "directory2/b/copy.txt", provide a destination_path of "directory2/b/copy.txt"
    /// </example>
    pub destination_path: String,
 }
@@ -57,11 +50,11 @@ impl AgentTool for CopyPathTool {
    type Input = CopyPathToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "copy_path".into()
+    fn name() -> &'static str {
+        "copy_path"
    }

-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
        ToolKind::Move
    }

--- a/crates/agent2/src/tools/create_directory_tool.rs
+++ b/crates/agent2/src/tools/create_directory_tool.rs
@@ -9,12 +9,9 @@ use util::markdown::MarkdownInlineCode;

 use crate::{AgentTool, ToolCallEventStream};

-/// Creates a new directory at the specified path within the project. Returns
-/// confirmation that the directory was created.
+/// 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 (similar
-/// to `mkdir -p`). 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.
@@ -44,11 +41,11 @@ impl AgentTool for CreateDirectoryTool {
    type Input = CreateDirectoryToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "create_directory".into()
+    fn name() -> &'static str {
+        "create_directory"
    }

-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
        ToolKind::Read
    }

--- a/crates/agent2/src/tools/delete_path_tool.rs
+++ b/crates/agent2/src/tools/delete_path_tool.rs
@@ -9,8 +9,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;

-/// Deletes the file or directory (and the directory's contents, recursively) at
-/// the specified path in the project, and returns confirmation of the deletion.
+/// Deletes the file or directory (and the directory's contents, recursively) at the specified path in the project, and returns confirmation of the deletion.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct DeletePathToolInput {
    /// The path of the file or directory to delete.
@@ -45,11 +44,11 @@ impl AgentTool for DeletePathTool {
    type Input = DeletePathToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "delete_path".into()
+    fn name() -> &'static str {
+        "delete_path"
    }

-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
        ToolKind::Delete
    }

--- a/crates/agent2/src/tools/diagnostics_tool.rs
+++ b/crates/agent2/src/tools/diagnostics_tool.rs
@@ -63,11 +63,11 @@ impl AgentTool for DiagnosticsTool {
    type Input = DiagnosticsToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "diagnostics".into()
+    fn name() -> &'static str {
+        "diagnostics"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Read
    }

--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -34,25 +34,21 @@ const DEFAULT_UI_TEXT: &str = "Editing file";
 ///    - Use the `list_directory` tool to verify the parent directory exists and is the correct location
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct EditFileToolInput {
-    /// A one-line, user-friendly markdown description of the edit. This will be
-    /// shown in the UI and also passed to another model to perform the edit.
+    /// A one-line, user-friendly markdown description of the edit. This will be shown in the UI and also passed to another model to perform the edit.
    ///
-    /// Be terse, but also descriptive in what you want to achieve with this
-    /// edit. Avoid generic instructions.
+    /// Be terse, but also descriptive in what you want to achieve with this edit. Avoid generic instructions.
    ///
    /// NEVER mention the file path in this description.
    ///
    /// <example>Fix API endpoint URLs</example>
    /// <example>Update copyright year in `page_footer`</example>
    ///
-    /// Make sure to include this field before all the others in the input object
-    /// so that we can display it immediately.
+    /// Make sure to include this field before all the others in the input object so that we can display it immediately.
    pub display_description: String,

    /// The full path of the file to create or modify in the project.
    ///
-    /// WARNING: When specifying which file path need changing, you MUST
-    /// start each path with one of the project's root directories.
+    /// WARNING: When specifying which file path need changing, you MUST start each path with one of the project's root directories.
    ///
    /// The following examples assume we have two root directories in the project:
    /// - /a/b/backend
@@ -61,22 +57,19 @@ pub struct EditFileToolInput {
    /// <example>
    /// `backend/src/main.rs`
    ///
-    /// Notice how the file path starts with `backend`. Without that, the path
-    /// would be ambiguous and the call would fail!
+    /// Notice how the file path starts with `backend`. Without that, the path would be ambiguous and the call would fail!
    /// </example>
    ///
    /// <example>
    /// `frontend/db.js`
    /// </example>
    pub path: PathBuf,
-
    /// The mode of operation on the file. Possible values:
    /// - 'edit': Make granular edits to an existing file.
    /// - 'create': Create a new file if it doesn't exist.
    /// - 'overwrite': Replace the entire contents of an existing file.
    ///
-    /// When a file already exists or you just created it, prefer editing
-    /// it as opposed to recreating it from scratch.
+    /// When a file already exists or you just created it, prefer editing it as opposed to recreating it from scratch.
    pub mode: EditFileMode,
 }

@@ -193,11 +186,11 @@ impl AgentTool for EditFileTool {
    type Input = EditFileToolInput;
    type Output = EditFileToolOutput;

-    fn name(&self) -> SharedString {
-        "edit_file".into()
+    fn name() -> &'static str {
+        "edit_file"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Edit
    }

@@ -524,7 +517,6 @@ fn resolve_path(
 mod tests {
    use super::*;
    use crate::{ContextServerRegistry, Templates};
-    use action_log::ActionLog;
    use client::TelemetrySettings;
    use fs::Fs;
    use gpui::{TestAppContext, UpdateGlobal};
@@ -542,7 +534,6 @@ mod tests {
        fs.insert_tree("/root", json!({})).await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let model = Arc::new(FakeLanguageModel::default());
@@ -551,7 +542,6 @@ mod tests {
                project,
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry,
-                action_log,
                Templates::new(),
                Some(model),
                cx,
@@ -742,7 +732,6 @@ mod tests {
            }
        });

-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let model = Arc::new(FakeLanguageModel::default());
@@ -751,7 +740,6 @@ mod tests {
                project,
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry,
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
@@ -808,7 +796,9 @@ mod tests {
            "Code should be formatted when format_on_save is enabled"
        );

-        let stale_buffer_count = action_log.read_with(cx, |log, cx| log.stale_buffers(cx).count());
+        let stale_buffer_count = thread
+            .read_with(cx, |thread, _cx| thread.action_log.clone())
+            .read_with(cx, |log, cx| log.stale_buffers(cx).count());

        assert_eq!(
            stale_buffer_count, 0,
@@ -886,14 +876,12 @@ mod tests {
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let model = Arc::new(FakeLanguageModel::default());
        let thread = cx.new(|cx| {
            Thread::new(
                project,
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry,
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
@@ -1015,14 +1003,12 @@ mod tests {
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let model = Arc::new(FakeLanguageModel::default());
        let thread = cx.new(|cx| {
            Thread::new(
                project,
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry,
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
@@ -1153,14 +1139,12 @@ mod tests {
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let model = Arc::new(FakeLanguageModel::default());
        let thread = cx.new(|cx| {
            Thread::new(
                project,
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry,
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
@@ -1261,7 +1245,6 @@ mod tests {
        )
        .await;
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let model = Arc::new(FakeLanguageModel::default());
@@ -1270,7 +1253,6 @@ mod tests {
                project.clone(),
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry.clone(),
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
@@ -1343,7 +1325,6 @@ mod tests {
        .await;
        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let model = Arc::new(FakeLanguageModel::default());
@@ -1352,7 +1333,6 @@ mod tests {
                project.clone(),
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry.clone(),
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
@@ -1428,7 +1408,6 @@ mod tests {
        .await;
        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let model = Arc::new(FakeLanguageModel::default());
@@ -1437,7 +1416,6 @@ mod tests {
                project.clone(),
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry.clone(),
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
@@ -1510,7 +1488,6 @@ mod tests {
        let fs = project::FakeFs::new(cx.executor());
        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let model = Arc::new(FakeLanguageModel::default());
@@ -1519,7 +1496,6 @@ mod tests {
                project.clone(),
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry,
-                action_log.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
--- a/crates/agent2/src/tools/fetch_tool.rs
+++ b/crates/agent2/src/tools/fetch_tool.rs
@@ -118,11 +118,11 @@ impl AgentTool for FetchTool {
    type Input = FetchToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "fetch".into()
+    fn name() -> &'static str {
+        "fetch"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Fetch
    }

@@ -136,12 +136,17 @@ impl AgentTool for FetchTool {
    fn run(
        self: Arc<Self>,
        input: Self::Input,
-        _event_stream: ToolCallEventStream,
+        event_stream: ToolCallEventStream,
        cx: &mut App,
    ) -> Task<Result<Self::Output>> {
+        let authorize = event_stream.authorize(input.url.clone(), cx);
+
        let text = cx.background_spawn({
            let http_client = self.http_client.clone();
-            async move { Self::build_message(http_client, &input.url).await }
+            async move {
+                authorize.await?;
+                Self::build_message(http_client, &input.url).await
+            }
        });

        cx.foreground_executor().spawn(async move {
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -31,7 +31,6 @@ pub struct FindPathToolInput {
    /// You can get back the first two paths by providing a glob of "*thing*.txt"
    /// </example>
    pub glob: String,
-
    /// Optional starting position for paginated results (0-based).
    /// When not provided, starts from the beginning.
    #[serde(default)]
@@ -86,11 +85,11 @@ impl AgentTool for FindPathTool {
    type Input = FindPathToolInput;
    type Output = FindPathToolOutput;

-    fn name(&self) -> SharedString {
-        "find_path".into()
+    fn name() -> &'static str {
+        "find_path"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Search
    }

@@ -166,16 +165,17 @@ fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Resu
        .collect();

    cx.background_spawn(async move {
-        Ok(snapshots
-            .iter()
-            .flat_map(|snapshot| {
+        let mut results = Vec::new();
+        for snapshot in snapshots {
+            for entry in snapshot.entries(false, 0) {
                let root_name = PathBuf::from(snapshot.root_name());
-                snapshot
-                    .entries(false, 0)
-                    .map(move |entry| root_name.join(&entry.path))
-                    .filter(|path| path_matcher.is_match(&path))
-            })
-            .collect())
+                if path_matcher.is_match(root_name.join(&entry.path)) {
+                    results.push(snapshot.abs_path().join(entry.path.as_ref()));
+                }
+            }
+        }
+
+        Ok(results)
    })
 }

@@ -216,8 +216,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("/root/apple/banana/carrot")),
+                PathBuf::from(path!("/root/apple/bandana/carbonara"))
            ]
        );

@@ -228,8 +228,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("/root/apple/banana/carrot")),
+                PathBuf::from(path!("/root/apple/bandana/carbonara"))
            ]
        );
    }
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -27,8 +27,7 @@ use util::paths::PathMatcher;
 /// - DO NOT use HTML entities solely to escape characters in the tool parameters.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct GrepToolInput {
-    /// A regex pattern to search for in the entire project. Note that the regex
-    /// will be parsed by the Rust `regex` crate.
+    /// A regex pattern to search for in the entire project. Note that the regex will be parsed by the Rust `regex` crate.
    ///
    /// Do NOT specify a path here! This will only be matched against the code **content**.
    pub regex: String,
@@ -68,11 +67,11 @@ impl AgentTool for GrepTool {
    type Input = GrepToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "grep".into()
+    fn name() -> &'static str {
+        "grep"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Search
    }

--- a/crates/agent2/src/tools/list_directory_tool.rs
+++ b/crates/agent2/src/tools/list_directory_tool.rs
@@ -10,14 +10,12 @@ use std::fmt::Write;
 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.
+/// Lists files and directories in a given path. Prefer the `grep` or `find_path` tools when searching the codebase.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ListDirectoryToolInput {
    /// The fully-qualified path of the directory to list in the project.
    ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
+    /// This path should never be absolute, and the first component of the path should always be a root directory in a project.
    ///
    /// <example>
    /// If the project has the following root directories:
@@ -53,11 +51,11 @@ impl AgentTool for ListDirectoryTool {
    type Input = ListDirectoryToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "list_directory".into()
+    fn name() -> &'static str {
+        "list_directory"
    }

-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
        ToolKind::Read
    }

--- a/crates/agent2/src/tools/move_path_tool.rs
+++ b/crates/agent2/src/tools/move_path_tool.rs
@@ -8,14 +8,11 @@ use serde::{Deserialize, Serialize};
 use std::{path::Path, sync::Arc};
 use util::markdown::MarkdownInlineCode;

-/// Moves or rename a file or directory in the project, and returns confirmation
-/// that the move succeeded.
+/// Moves or rename a file or directory in the project, and returns confirmation that the move succeeded.
 ///
-/// If the source and destination directories are the same, but the filename is
-/// different, this performs a rename. Otherwise, it performs a move.
+/// If the source and destination directories are the same, but the filename is different, this performs a rename. Otherwise, it performs a move.
 ///
-/// This tool should be used when it's desirable to move or rename a file or
-/// directory without changing its contents at all.
+/// This tool should be used when it's desirable to move or rename a file or directory without changing its contents at all.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct MovePathToolInput {
    /// The source path of the file or directory to move/rename.
@@ -55,11 +52,11 @@ impl AgentTool for MovePathTool {
    type Input = MovePathToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "move_path".into()
+    fn name() -> &'static str {
+        "move_path"
    }

-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
        ToolKind::Move
    }

--- a/crates/agent2/src/tools/now_tool.rs
+++ b/crates/agent2/src/tools/now_tool.rs
@@ -32,11 +32,11 @@ impl AgentTool for NowTool {
    type Input = NowToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "now".into()
+    fn name() -> &'static str {
+        "now"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Other
    }

--- a/crates/agent2/src/tools/open_tool.rs
+++ b/crates/agent2/src/tools/open_tool.rs
@@ -8,19 +8,15 @@ use serde::{Deserialize, Serialize};
 use std::{path::PathBuf, sync::Arc};
 use util::markdown::MarkdownEscaped;

-/// This tool opens a file or URL with the default application associated with
-/// it on the user's operating system:
+/// This tool opens a file or URL with the default application associated with it on the user's operating system:
 ///
 /// - On macOS, it's equivalent to the `open` command
 /// - On Windows, it's equivalent to `start`
 /// - On Linux, it uses something like `xdg-open`, `gio open`, `gnome-open`, `kde-open`, `wslview` as appropriate
 ///
-/// For example, it can open a web browser with a URL, open a PDF file with the
-/// default PDF viewer, etc.
+/// For example, it can open a web browser with a URL, open a PDF file with the default PDF viewer, etc.
 ///
-/// You MUST ONLY use this tool when the user has explicitly requested opening
-/// something. You MUST NEVER assume that the user would like for you to use
-/// this tool.
+/// You MUST ONLY use this tool when the user has explicitly requested opening something. You MUST NEVER assume that the user would like for you to use this tool.
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct OpenToolInput {
    /// The path or URL to open with the default application.
@@ -41,11 +37,11 @@ impl AgentTool for OpenTool {
    type Input = OpenToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "open".into()
+    fn name() -> &'static str {
+        "open"
    }

-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
        ToolKind::Execute
    }

--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -10,7 +10,8 @@ use project::{AgentLocation, ImageItem, Project, WorktreeSettings, image_store};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
-use std::sync::Arc;
+use std::{path::Path, sync::Arc};
+use util::markdown::MarkdownCodeBlock;

 use crate::{AgentTool, ToolCallEventStream};

@@ -21,8 +22,7 @@ use crate::{AgentTool, ToolCallEventStream};
 pub struct ReadFileToolInput {
    /// The relative path of the file to read.
    ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
+    /// This path should never be absolute, and the first component of the path should always be a root directory in a project.
    ///
    /// <example>
    /// If the project has the following root directories:
@@ -34,11 +34,9 @@ pub struct ReadFileToolInput {
    /// If you want to access `file.txt` in `directory2`, you should use the path `directory2/file.txt`.
    /// </example>
    pub path: String,
-
    /// Optional line number to start reading on (1-based index)
    #[serde(default)]
    pub start_line: Option<u32>,
-
    /// Optional line number to end reading on (1-based index, inclusive)
    #[serde(default)]
    pub end_line: Option<u32>,
@@ -62,36 +60,21 @@ impl AgentTool for ReadFileTool {
    type Input = ReadFileToolInput;
    type Output = LanguageModelToolResultContent;

-    fn name(&self) -> SharedString {
-        "read_file".into()
+    fn name() -> &'static str {
+        "read_file"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Read
    }

    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
-        if let Ok(input) = input {
-            let path = &input.path;
-            match (input.start_line, input.end_line) {
-                (Some(start), Some(end)) => {
-                    format!(
-                        "[Read file `{}` (lines {}-{})](@selection:{}:({}-{}))",
-                        path, start, end, path, start, end
-                    )
-                }
-                (Some(start), None) => {
-                    format!(
-                        "[Read file `{}` (from line {})](@selection:{}:({}-{}))",
-                        path, start, path, start, start
-                    )
-                }
-                _ => format!("[Read file `{}`](@file:{})", path, path),
-            }
-            .into()
-        } else {
-            "Read file".into()
-        }
+        input
+            .ok()
+            .as_ref()
+            .and_then(|input| Path::new(&input.path).file_name())
+            .map(|file_name| file_name.to_string_lossy().to_string().into())
+            .unwrap_or_default()
    }

    fn run(
@@ -261,6 +244,19 @@ impl AgentTool for ReadFileTool {
                        }]),
                        ..Default::default()
                    });
+                    if let Ok(LanguageModelToolResultContent::Text(text)) = &result {
+                        let markdown = MarkdownCodeBlock {
+                            tag: &input.path,
+                            text,
+                        }
+                        .to_string();
+                        event_stream.update_fields(ToolCallUpdateFields {
+                            content: Some(vec![acp::ToolCallContent::Content {
+                                content: markdown.into(),
+                            }]),
+                            ..Default::default()
+                        })
+                    }
                }
            })?;

--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -63,11 +63,11 @@ impl AgentTool for TerminalTool {
    type Input = TerminalToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "terminal".into()
+    fn name() -> &'static str {
+        "terminal"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Execute
    }

--- a/crates/agent2/src/tools/thinking_tool.rs
+++ b/crates/agent2/src/tools/thinking_tool.rs
@@ -11,8 +11,7 @@ use crate::{AgentTool, ToolCallEventStream};
 /// Use this tool when you need to work through complex problems, develop strategies, or outline approaches before taking action.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ThinkingToolInput {
-    /// Content to think about. This should be a description of what to think about or
-    /// a problem to solve.
+    /// Content to think about. This should be a description of what to think about or a problem to solve.
    content: String,
 }

@@ -22,11 +21,11 @@ impl AgentTool for ThinkingTool {
    type Input = ThinkingToolInput;
    type Output = String;

-    fn name(&self) -> SharedString {
-        "thinking".into()
+    fn name() -> &'static str {
+        "thinking"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Think
    }

--- a/crates/agent2/src/tools/web_search_tool.rs
+++ b/crates/agent2/src/tools/web_search_tool.rs
@@ -14,7 +14,7 @@ use ui::prelude::*;
 use web_search::WebSearchRegistry;

 /// Search the web for information using your query.
-/// Use this when you need real-time information, facts, or data that might not be in your training. \
+/// Use this when you need real-time information, facts, or data that might not be in your training.
 /// Results will include snippets and links from relevant web pages.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct WebSearchToolInput {
@@ -40,11 +40,11 @@ impl AgentTool for WebSearchTool {
    type Input = WebSearchToolInput;
    type Output = WebSearchToolOutput;

-    fn name(&self) -> SharedString {
-        "web_search".into()
+    fn name() -> &'static str {
+        "web_search"
    }

-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
        acp::ToolKind::Fetch
    }

--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -6,7 +6,7 @@ publish.workspace = true
 license = "GPL-3.0-or-later"

 [features]
-test-support = ["acp_thread/test-support", "gpui/test-support", "project/test-support"]
+test-support = ["acp_thread/test-support", "gpui/test-support", "project/test-support", "dep:env_logger", "fs", "client/test-support", "dep:gpui_tokio", "reqwest_client/test-support"]
 e2e = []

 [lints]
@@ -17,16 +17,20 @@ path = "src/agent_servers.rs"
 doctest = false

 [dependencies]
+acp_tools.workspace = true
 acp_thread.workspace = true
 action_log.workspace = true
 agent-client-protocol.workspace = true
 agent_settings.workspace = true
-agentic-coding-protocol.workspace = true
 anyhow.workspace = true
+client = { workspace = true, optional = true }
 collections.workspace = true
 context_server.workspace = true
+env_logger = { workspace = true, optional = true }
+fs = { workspace = true, optional = true }
 futures.workspace = true
 gpui.workspace = true
+gpui_tokio = { workspace = true, optional = true }
 indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
@@ -36,6 +40,7 @@ log.workspace = true
 paths.workspace = true
 project.workspace = true
 rand.workspace = true
+reqwest_client = { workspace = true, optional = true }
 schemars.workspace = true
 semver.workspace = true
 serde.workspace = true
@@ -57,8 +62,12 @@ libc.workspace = true
 nix.workspace = true

 [dev-dependencies]
+client = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
+fs.workspace = true
 language.workspace = true
 indoc.workspace = true
 acp_thread = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
+gpui_tokio.workspace = true
+reqwest_client = { workspace = true, features = ["test-support"] }
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -1,34 +1,426 @@
-use std::{path::Path, rc::Rc};
-
 use crate::AgentServerCommand;
 use acp_thread::AgentConnection;
-use anyhow::Result;
-use gpui::AsyncApp;
+use acp_tools::AcpConnectionRegistry;
+use action_log::ActionLog;
+use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
+use anyhow::anyhow;
+use collections::HashMap;
+use futures::AsyncBufReadExt as _;
+use futures::channel::oneshot;
+use futures::io::BufReader;
+use project::Project;
+use serde::Deserialize;
+use std::{any::Any, cell::RefCell};
+use std::{path::Path, rc::Rc};
 use thiserror::Error;

-mod v0;
-mod v1;
+use anyhow::{Context as _, Result};
+use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntity};
+
+use acp_thread::{AcpThread, AuthRequired, LoadError};

 #[derive(Debug, Error)]
 #[error("Unsupported version")]
 pub struct UnsupportedVersion;

+pub struct AcpConnection {
+    server_name: SharedString,
+    connection: Rc<acp::ClientSideConnection>,
+    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
+    auth_methods: Vec<acp::AuthMethod>,
+    prompt_capabilities: acp::PromptCapabilities,
+    supports_rewind: bool,
+    _io_task: Task<Result<()>>,
+}
+
+pub struct AcpSession {
+    thread: WeakEntity<AcpThread>,
+    suppress_abort_err: bool,
+}
+
 pub async fn connect(
-    server_name: &'static str,
+    server_name: SharedString,
    command: AgentServerCommand,
    root_dir: &Path,
    cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
-    let conn = v1::AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await;
+    let conn = AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await?;
+    Ok(Rc::new(conn) as _)
+}

-    match conn {
-        Ok(conn) => Ok(Rc::new(conn) as _),
-        Err(err) if err.is::<UnsupportedVersion>() => {
-            // Consider re-using initialize response and subprocess when adding another version here
-            let conn: Rc<dyn AgentConnection> =
-                Rc::new(v0::AcpConnection::stdio(server_name, command, root_dir, cx).await?);
-            Ok(conn)
+const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
+
+impl AcpConnection {
+    pub async fn stdio(
+        server_name: SharedString,
+        command: AgentServerCommand,
+        root_dir: &Path,
+        cx: &mut AsyncApp,
+    ) -> Result<Self> {
+        let mut child = util::command::new_smol_command(&command.path)
+            .args(command.args.iter().map(|arg| arg.as_str()))
+            .envs(command.env.iter().flatten())
+            .current_dir(root_dir)
+            .stdin(std::process::Stdio::piped())
+            .stdout(std::process::Stdio::piped())
+            .stderr(std::process::Stdio::piped())
+            .kill_on_drop(true)
+            .spawn()?;
+
+        let stdout = child.stdout.take().context("Failed to take stdout")?;
+        let stdin = child.stdin.take().context("Failed to take stdin")?;
+        let stderr = child.stderr.take().context("Failed to take stderr")?;
+        log::trace!("Spawned (pid: {})", child.id());
+
+        let sessions = Rc::new(RefCell::new(HashMap::default()));
+
+        let client = ClientDelegate {
+            sessions: sessions.clone(),
+            cx: cx.clone(),
+        };
+        let (connection, io_task) = acp::ClientSideConnection::new(client, stdin, stdout, {
+            let foreground_executor = cx.foreground_executor().clone();
+            move |fut| {
+                foreground_executor.spawn(fut).detach();
+            }
+        });
+
+        let io_task = cx.background_spawn(io_task);
+
+        cx.background_spawn(async move {
+            let mut stderr = BufReader::new(stderr);
+            let mut line = String::new();
+            while let Ok(n) = stderr.read_line(&mut line).await
+                && n > 0
+            {
+                log::warn!("agent stderr: {}", &line);
+                line.clear();
+            }
+        })
+        .detach();
+
+        cx.spawn({
+            let sessions = sessions.clone();
+            async move |cx| {
+                let status = child.status().await?;
+
+                for session in sessions.borrow().values() {
+                    session
+                        .thread
+                        .update(cx, |thread, cx| {
+                            thread.emit_load_error(LoadError::Exited { status }, cx)
+                        })
+                        .ok();
+                }
+
+                anyhow::Ok(())
+            }
+        })
+        .detach();
+
+        let connection = Rc::new(connection);
+
+        cx.update(|cx| {
+            AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
+                registry.set_active_connection(server_name.clone(), &connection, cx)
+            });
+        })?;
+
+        let response = connection
+            .initialize(acp::InitializeRequest {
+                protocol_version: acp::VERSION,
+                client_capabilities: acp::ClientCapabilities {
+                    fs: acp::FileSystemCapability {
+                        read_text_file: true,
+                        write_text_file: true,
+                    },
+                },
+            })
+            .await?;
+
+        if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
+            return Err(UnsupportedVersion.into());
        }
-        Err(err) => Err(err),
+
+        Ok(Self {
+            auth_methods: response.auth_methods,
+            connection,
+            server_name,
+            sessions,
+            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
+            supports_rewind: response.agent_capabilities.rewind_session,
+            _io_task: io_task,
+        })
+    }
+}
+
+impl AgentConnection for AcpConnection {
+    fn new_thread(
+        self: Rc<Self>,
+        project: Entity<Project>,
+        cwd: &Path,
+        cx: &mut App,
+    ) -> Task<Result<Entity<AcpThread>>> {
+        let conn = self.connection.clone();
+        let sessions = self.sessions.clone();
+        let cwd = cwd.to_path_buf();
+        cx.spawn(async move |cx| {
+            let response = conn
+                .new_session(acp::NewSessionRequest {
+                    mcp_servers: vec![],
+                    cwd,
+                })
+                .await
+                .map_err(|err| {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
+                        let mut error = AuthRequired::new();
+
+                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
+                            error = error.with_description(err.message);
+                        }
+
+                        anyhow!(error)
+                    } else {
+                        anyhow!(err)
+                    }
+                })?;
+
+            let session_id = response.session_id;
+            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
+            let thread = cx.new(|cx| {
+                AcpThread::new(
+                    self.server_name.clone(),
+                    self.clone(),
+                    project,
+                    action_log,
+                    session_id.clone(),
+                    // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
+                    watch::Receiver::constant(self.prompt_capabilities),
+                    cx,
+                )
+            })?;
+
+            let session = AcpSession {
+                thread: thread.downgrade(),
+                suppress_abort_err: false,
+            };
+            sessions.borrow_mut().insert(session_id, session);
+
+            Ok(thread)
+        })
+    }
+
+    fn auth_methods(&self) -> &[acp::AuthMethod] {
+        &self.auth_methods
+    }
+
+    fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
+        let conn = self.connection.clone();
+        cx.foreground_executor().spawn(async move {
+            let result = conn
+                .authenticate(acp::AuthenticateRequest {
+                    method_id: method_id.clone(),
+                })
+                .await?;
+
+            Ok(result)
+        })
+    }
+
+    fn rewind(
+        &self,
+        session_id: &agent_client_protocol::SessionId,
+        _cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionRewind>> {
+        if !self.supports_rewind {
+            return None;
+        }
+        Some(Rc::new(AcpRewinder {
+            connection: self.connection.clone(),
+            session_id: session_id.clone(),
+        }) as _)
+    }
+
+    fn prompt(
+        &self,
+        params: acp::PromptRequest,
+        cx: &mut App,
+    ) -> Task<Result<acp::PromptResponse>> {
+        let conn = self.connection.clone();
+        let sessions = self.sessions.clone();
+        let session_id = params.session_id.clone();
+        cx.foreground_executor().spawn(async move {
+            let result = conn.prompt(params).await;
+
+            let mut suppress_abort_err = false;
+
+            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
+                suppress_abort_err = session.suppress_abort_err;
+                session.suppress_abort_err = false;
+            }
+
+            match result {
+                Ok(response) => Ok(response),
+                Err(err) => {
+                    if err.code != ErrorCode::INTERNAL_ERROR.code {
+                        anyhow::bail!(err)
+                    }
+
+                    let Some(data) = &err.data else {
+                        anyhow::bail!(err)
+                    };
+
+                    // Temporary workaround until the following PR is generally available:
+                    // https://github.com/google-gemini/gemini-cli/pull/6656
+
+                    #[derive(Deserialize)]
+                    #[serde(deny_unknown_fields)]
+                    struct ErrorDetails {
+                        details: Box<str>,
+                    }
+
+                    match serde_json::from_value(data.clone()) {
+                        Ok(ErrorDetails { details }) => {
+                            if suppress_abort_err
+                                && (details.contains("This operation was aborted")
+                                    || details.contains("The user aborted a request"))
+                            {
+                                Ok(acp::PromptResponse {
+                                    stop_reason: acp::StopReason::Cancelled,
+                                })
+                            } else {
+                                Err(anyhow!(details))
+                            }
+                        }
+                        Err(_) => Err(anyhow!(err)),
+                    }
+                }
+            }
+        })
+    }
+
+    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
+        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
+            session.suppress_abort_err = true;
+        }
+        let conn = self.connection.clone();
+        let params = acp::CancelNotification {
+            session_id: session_id.clone(),
+        };
+        cx.foreground_executor()
+            .spawn(async move { conn.cancel(params).await })
+            .detach();
+    }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
+}
+
+struct AcpRewinder {
+    connection: Rc<acp::ClientSideConnection>,
+    session_id: acp::SessionId,
+}
+
+impl acp_thread::AgentSessionRewind for AcpRewinder {
+    fn rewind(&self, prompt_id: acp::PromptId, cx: &mut App) -> Task<Result<()>> {
+        let conn = self.connection.clone();
+        let params = acp::RewindRequest {
+            session_id: self.session_id.clone(),
+            prompt_id,
+        };
+        cx.foreground_executor().spawn(async move {
+            conn.rewind(params).await?;
+            Ok(())
+        })
+    }
+}
+
+struct ClientDelegate {
+    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
+    cx: AsyncApp,
+}
+
+impl acp::Client for ClientDelegate {
+    async fn request_permission(
+        &self,
+        arguments: acp::RequestPermissionRequest,
+    ) -> Result<acp::RequestPermissionResponse, acp::Error> {
+        let cx = &mut self.cx.clone();
+        let rx = self
+            .sessions
+            .borrow()
+            .get(&arguments.session_id)
+            .context("Failed to get session")?
+            .thread
+            .update(cx, |thread, cx| {
+                thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
+            })?;
+
+        let result = rx?.await;
+
+        let outcome = match result {
+            Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
+            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
+        };
+
+        Ok(acp::RequestPermissionResponse { outcome })
+    }
+
+    async fn write_text_file(
+        &self,
+        arguments: acp::WriteTextFileRequest,
+    ) -> Result<(), acp::Error> {
+        let cx = &mut self.cx.clone();
+        let task = self
+            .sessions
+            .borrow()
+            .get(&arguments.session_id)
+            .context("Failed to get session")?
+            .thread
+            .update(cx, |thread, cx| {
+                thread.write_text_file(arguments.path, arguments.content, cx)
+            })?;
+
+        task.await?;
+
+        Ok(())
+    }
+
+    async fn read_text_file(
+        &self,
+        arguments: acp::ReadTextFileRequest,
+    ) -> Result<acp::ReadTextFileResponse, acp::Error> {
+        let cx = &mut self.cx.clone();
+        let task = self
+            .sessions
+            .borrow()
+            .get(&arguments.session_id)
+            .context("Failed to get session")?
+            .thread
+            .update(cx, |thread, cx| {
+                thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
+            })?;
+
+        let content = task.await?;
+
+        Ok(acp::ReadTextFileResponse { content })
+    }
+
+    async fn session_notification(
+        &self,
+        notification: acp::SessionNotification,
+    ) -> Result<(), acp::Error> {
+        let cx = &mut self.cx.clone();
+        let sessions = self.sessions.borrow();
+        let session = sessions
+            .get(&notification.session_id)
+            .context("Failed to get session")?;
+
+        session.thread.update(cx, |thread, cx| {
+            thread.handle_session_update(notification.update, cx)
+        })??;
+
+        Ok(())
    }
 }
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -1,11 +1,13 @@
+use acp_tools::AcpConnectionRegistry;
 use action_log::ActionLog;
-use agent_client_protocol::{self as acp, Agent as _};
+use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
 use anyhow::anyhow;
 use collections::HashMap;
 use futures::AsyncBufReadExt as _;
 use futures::channel::oneshot;
 use futures::io::BufReader;
 use project::Project;
+use serde::Deserialize;
 use std::path::Path;
 use std::rc::Rc;
 use std::{any::Any, cell::RefCell};
@@ -27,6 +29,7 @@ pub struct AcpConnection {

 pub struct AcpSession {
    thread: WeakEntity<AcpThread>,
+    suppress_abort_err: bool,
 }

 const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
@@ -99,6 +102,14 @@ impl AcpConnection {
        })
        .detach();

+        let connection = Rc::new(connection);
+
+        cx.update(|cx| {
+            AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
+                registry.set_active_connection(server_name, &connection, cx)
+            });
+        })?;
+
        let response = connection
            .initialize(acp::InitializeRequest {
                protocol_version: acp::VERSION,
@@ -117,7 +128,7 @@ impl AcpConnection {

        Ok(Self {
            auth_methods: response.auth_methods,
-            connection: connection.into(),
+            connection,
            server_name,
            sessions,
            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
@@ -171,6 +182,7 @@ impl AgentConnection for AcpConnection {

            let session = AcpSession {
                thread: thread.downgrade(),
+                suppress_abort_err: false,
            };
            sessions.borrow_mut().insert(session_id, session);

@@ -202,9 +214,53 @@ impl AgentConnection for AcpConnection {
        cx: &mut App,
    ) -> Task<Result<acp::PromptResponse>> {
        let conn = self.connection.clone();
+        let sessions = self.sessions.clone();
+        let session_id = params.session_id.clone();
        cx.foreground_executor().spawn(async move {
-            let response = conn.prompt(params).await?;
-            Ok(response)
+            let result = conn.prompt(params).await;
+
+            let mut suppress_abort_err = false;
+
+            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
+                suppress_abort_err = session.suppress_abort_err;
+                session.suppress_abort_err = false;
+            }
+
+            match result {
+                Ok(response) => Ok(response),
+                Err(err) => {
+                    if err.code != ErrorCode::INTERNAL_ERROR.code {
+                        anyhow::bail!(err)
+                    }
+
+                    let Some(data) = &err.data else {
+                        anyhow::bail!(err)
+                    };
+
+                    // Temporary workaround until the following PR is generally available:
+                    // https://github.com/google-gemini/gemini-cli/pull/6656
+
+                    #[derive(Deserialize)]
+                    #[serde(deny_unknown_fields)]
+                    struct ErrorDetails {
+                        details: Box<str>,
+                    }
+
+                    match serde_json::from_value(data.clone()) {
+                        Ok(ErrorDetails { details }) => {
+                            if suppress_abort_err && details.contains("This operation was aborted")
+                            {
+                                Ok(acp::PromptResponse {
+                                    stop_reason: acp::StopReason::Cancelled,
+                                })
+                            } else {
+                                Err(anyhow!(details))
+                            }
+                        }
+                        Err(_) => Err(anyhow!(err)),
+                    }
+                }
+            }
        })
    }

@@ -213,6 +269,9 @@ impl AgentConnection for AcpConnection {
    }

    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
+        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
+            session.suppress_abort_err = true;
+        }
        let conn = self.connection.clone();
        let params = acp::CancelNotification {
            session_id: session_id.clone(),
@@ -252,7 +311,7 @@ impl acp::Client for ClientDelegate {

        let outcome = match result {
            Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
-            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Canceled,
+            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
        };

        Ok(acp::RequestPermissionResponse { outcome })
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -1,12 +1,14 @@
 mod acp;
 mod claude;
+mod custom;
 mod gemini;
 mod settings;

-#[cfg(test)]
-mod e2e_tests;
+#[cfg(any(test, feature = "test-support"))]
+pub mod e2e_tests;

 pub use claude::*;
+pub use custom::*;
 pub use gemini::*;
 pub use settings::*;

@@ -31,9 +33,10 @@ pub fn init(cx: &mut App) {

 pub trait AgentServer: Send {
    fn logo(&self) -> ui::IconName;
-    fn name(&self) -> &'static str;
-    fn empty_state_headline(&self) -> &'static str;
-    fn empty_state_message(&self) -> &'static str;
+    fn name(&self) -> SharedString;
+    fn empty_state_headline(&self) -> SharedString;
+    fn empty_state_message(&self) -> SharedString;
+    fn telemetry_id(&self) -> &'static str;

    fn connect(
        &self,
@@ -95,7 +98,7 @@ pub struct AgentServerCommand {
 }

 impl AgentServerCommand {
-    pub(crate) async fn resolve(
+    pub async fn resolve(
        path_bin_name: &'static str,
        extra_args: &[&'static str],
        fallback_path: Option<&Path>,
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -30,7 +30,7 @@ use futures::{
    io::BufReader,
    select_biased,
 };
-use gpui::{App, AppContext, AsyncApp, Entity, Task, WeakEntity};
+use gpui::{App, AppContext, AsyncApp, Entity, SharedString, Task, WeakEntity};
 use serde::{Deserialize, Serialize};
 use util::{ResultExt, debug_panic};

@@ -43,16 +43,20 @@ use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError, MentionUri
 pub struct ClaudeCode;

 impl AgentServer for ClaudeCode {
-    fn name(&self) -> &'static str {
-        "Claude Code"
+    fn telemetry_id(&self) -> &'static str {
+        "claude-code"
    }

-    fn empty_state_headline(&self) -> &'static str {
+    fn name(&self) -> SharedString {
+        "Claude Code".into()
+    }
+
+    fn empty_state_headline(&self) -> SharedString {
        self.name()
    }

-    fn empty_state_message(&self) -> &'static str {
-        "How can I help you today?"
+    fn empty_state_message(&self) -> SharedString {
+        "How can I help you today?".into()
    }

    fn logo(&self) -> ui::IconName {
@@ -249,13 +253,19 @@ impl AgentConnection for ClaudeAgentConnection {
            });

            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
-            let thread = cx.new(|_cx| {
+            let thread = cx.new(|cx| {
                AcpThread::new(
                    "Claude Code",
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: false,
+                        embedded_context: true,
+                    }),
+                    cx,
                )
            })?;

@@ -284,7 +294,6 @@ impl AgentConnection for ClaudeAgentConnection {

    fn prompt(
        &self,
-        _id: Option<acp_thread::UserMessageId>,
        params: acp::PromptRequest,
        cx: &mut App,
    ) -> Task<Result<acp::PromptResponse>> {
@@ -319,14 +328,6 @@ impl AgentConnection for ClaudeAgentConnection {
        cx.foreground_executor().spawn(async move { end_rx.await? })
    }

-    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        acp::PromptCapabilities {
-            image: true,
-            audio: false,
-            embedded_context: true,
-        }
-    }
-
    fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
        let sessions = self.sessions.borrow();
        let Some(session) = sessions.get(session_id) else {
@@ -705,7 +706,7 @@ impl ClaudeAgentSession {
                    let stop_reason = match subtype {
                        ResultErrorType::Success => acp::StopReason::EndTurn,
                        ResultErrorType::ErrorMaxTurns => acp::StopReason::MaxTurnRequests,
-                        ResultErrorType::ErrorDuringExecution => acp::StopReason::Canceled,
+                        ResultErrorType::ErrorDuringExecution => acp::StopReason::Cancelled,
                    };
                    end_turn_tx
                        .send(Ok(acp::PromptResponse { stop_reason }))
@@ -1093,7 +1094,7 @@ pub(crate) mod tests {
    use gpui::TestAppContext;
    use serde_json::json;

-    crate::common_e2e_tests!(ClaudeCode, allow_option_id = "allow");
+    crate::common_e2e_tests!(async |_, _, _| ClaudeCode, allow_option_id = "allow");

    pub fn local_command() -> AgentServerCommand {
        AgentServerCommand {
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -0,0 +1,63 @@
+use crate::{AgentServerCommand, AgentServerSettings};
+use acp_thread::AgentConnection;
+use anyhow::Result;
+use gpui::{App, Entity, SharedString, Task};
+use project::Project;
+use std::{path::Path, rc::Rc};
+use ui::IconName;
+
+/// A generic agent server implementation for custom user-defined agents
+pub struct CustomAgentServer {
+    name: SharedString,
+    command: AgentServerCommand,
+}
+
+impl CustomAgentServer {
+    pub fn new(name: SharedString, settings: &AgentServerSettings) -> Self {
+        Self {
+            name,
+            command: settings.command.clone(),
+        }
+    }
+}
+
+impl crate::AgentServer for CustomAgentServer {
+    fn telemetry_id(&self) -> &'static str {
+        "custom"
+    }
+
+    fn name(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn logo(&self) -> IconName {
+        IconName::Terminal
+    }
+
+    fn empty_state_headline(&self) -> SharedString {
+        "No conversations yet".into()
+    }
+
+    fn empty_state_message(&self) -> SharedString {
+        format!("Start a conversation with {}", self.name).into()
+    }
+
+    fn connect(
+        &self,
+        root_dir: &Path,
+        _project: &Entity<Project>,
+        cx: &mut App,
+    ) -> Task<Result<Rc<dyn AgentConnection>>> {
+        let server_name = self.name();
+        let command = self.command.clone();
+        let root_dir = root_dir.to_path_buf();
+
+        cx.spawn(async move |mut cx| {
+            crate::acp::connect(server_name, command, &root_dir, &mut cx).await
+        })
+    }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
+        self
+    }
+}
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,24 +1,31 @@
+use crate::AgentServer;
+use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus, new_prompt_id};
+use agent_client_protocol as acp;
+use futures::{FutureExt, StreamExt, channel::mpsc, select};
+use gpui::{AppContext, Entity, TestAppContext};
+use indoc::indoc;
+use project::{FakeFs, Project};
 use std::{
    path::{Path, PathBuf},
    sync::Arc,
    time::Duration,
 };
-
-use crate::{AgentServer, AgentServerSettings, AllAgentServersSettings};
-use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
-use agent_client_protocol as acp;
-
-use futures::{FutureExt, StreamExt, channel::mpsc, select};
-use gpui::{Entity, TestAppContext};
-use indoc::indoc;
-use project::{FakeFs, Project};
-use settings::{Settings, SettingsStore};
 use util::path;

-pub async fn test_basic(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let fs = init_test(cx).await;
-    let project = Project::test(fs, [], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+pub async fn test_basic<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
+    let project = Project::test(fs.clone(), [], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;

    thread
        .update(cx, |thread, cx| thread.send_raw("Hello from Zed!", cx))
@@ -42,8 +49,12 @@ pub async fn test_basic(server: impl AgentServer + 'static, cx: &mut TestAppCont
    });
 }

-pub async fn test_path_mentions(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let _fs = init_test(cx).await;
+pub async fn test_path_mentions<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as _;

    let tempdir = tempfile::tempdir().unwrap();
    std::fs::write(
@@ -56,10 +67,17 @@ pub async fn test_path_mentions(server: impl AgentServer + 'static, cx: &mut Tes
    )
    .expect("failed to write file");
    let project = Project::example([tempdir.path()], &mut cx.to_async()).await;
-    let thread = new_test_thread(server, project.clone(), tempdir.path(), cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        tempdir.path(),
+        cx,
+    )
+    .await;
    thread
        .update(cx, |thread, cx| {
            thread.send(
+                new_prompt_id(),
                vec![
                    acp::ContentBlock::Text(acp::TextContent {
                        text: "Read the file ".into(),
@@ -110,15 +128,25 @@ pub async fn test_path_mentions(server: impl AgentServer + 'static, cx: &mut Tes
    drop(tempdir);
 }

-pub async fn test_tool_call(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let _fs = init_test(cx).await;
+pub async fn test_tool_call<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as _;

    let tempdir = tempfile::tempdir().unwrap();
    let foo_path = tempdir.path().join("foo");
    std::fs::write(&foo_path, "Lorem ipsum dolor").expect("failed to write file");

    let project = Project::example([tempdir.path()], &mut cx.to_async()).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;

    thread
        .update(cx, |thread, cx| {
@@ -152,14 +180,23 @@ pub async fn test_tool_call(server: impl AgentServer + 'static, cx: &mut TestApp
    drop(tempdir);
 }

-pub async fn test_tool_call_with_permission(
-    server: impl AgentServer + 'static,
+pub async fn test_tool_call_with_permission<T, F>(
+    server: F,
    allow_option_id: acp::PermissionOptionId,
    cx: &mut TestAppContext,
-) {
-    let fs = init_test(cx).await;
-    let project = Project::test(fs, [path!("/private/tmp").as_ref()], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+) where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
+    let project = Project::test(fs.clone(), [path!("/private/tmp").as_ref()], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;
    let full_turn = thread.update(cx, |thread, cx| {
        thread.send_raw(
            r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
@@ -247,11 +284,21 @@ pub async fn test_tool_call_with_permission(
    });
 }

-pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let fs = init_test(cx).await;
+pub async fn test_cancel<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;

-    let project = Project::test(fs, [path!("/private/tmp").as_ref()], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+    let project = Project::test(fs.clone(), [path!("/private/tmp").as_ref()], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;
    let _ = thread.update(cx, |thread, cx| {
        thread.send_raw(
            r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
@@ -316,10 +363,20 @@ pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppCon
    });
 }

-pub async fn test_thread_drop(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let fs = init_test(cx).await;
-    let project = Project::test(fs, [], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+pub async fn test_thread_drop<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
+    let project = Project::test(fs.clone(), [], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;

    thread
        .update(cx, |thread, cx| thread.send_raw("Hello from test!", cx))
@@ -386,27 +443,42 @@ macro_rules! common_e2e_tests {
        }
    };
 }
+pub use common_e2e_tests;

 // Helpers

 pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
+    #[cfg(test)]
+    use settings::Settings;
+
    env_logger::try_init().ok();

    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
+        let settings_store = settings::SettingsStore::test(cx);
        cx.set_global(settings_store);
        Project::init_settings(cx);
        language::init(cx);
+        gpui_tokio::init(cx);
+        let http_client = reqwest_client::ReqwestClient::user_agent("agent tests").unwrap();
+        cx.set_http_client(Arc::new(http_client));
+        client::init_settings(cx);
+        let client = client::Client::production(cx);
+        let user_store = cx.new(|cx| client::UserStore::new(client.clone(), cx));
+        language_model::init(client.clone(), cx);
+        language_models::init(user_store, client, cx);
+        agent_settings::init(cx);
        crate::settings::init(cx);

+        #[cfg(test)]
        crate::AllAgentServersSettings::override_global(
-            AllAgentServersSettings {
-                claude: Some(AgentServerSettings {
+            crate::AllAgentServersSettings {
+                claude: Some(crate::AgentServerSettings {
                    command: crate::claude::tests::local_command(),
                }),
-                gemini: Some(AgentServerSettings {
+                gemini: Some(crate::AgentServerSettings {
                    command: crate::gemini::tests::local_command(),
                }),
+                custom: collections::HashMap::default(),
            },
            cx,
        );
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -4,10 +4,10 @@ use std::{any::Any, path::Path};
 use crate::{AgentServer, AgentServerCommand};
 use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
-use gpui::{Entity, Task};
+use gpui::{App, Entity, SharedString, Task};
+use language_models::provider::google::GoogleLanguageModelProvider;
 use project::Project;
 use settings::SettingsStore;
-use ui::App;

 use crate::AllAgentServersSettings;

@@ -17,16 +17,20 @@ pub struct Gemini;
 const ACP_ARG: &str = "--experimental-acp";

 impl AgentServer for Gemini {
-    fn name(&self) -> &'static str {
-        "Gemini"
+    fn telemetry_id(&self) -> &'static str {
+        "gemini-cli"
    }

-    fn empty_state_headline(&self) -> &'static str {
-        "Welcome to Gemini"
+    fn name(&self) -> SharedString {
+        "Gemini CLI".into()
    }

-    fn empty_state_message(&self) -> &'static str {
-        "Ask questions, edit files, run commands"
+    fn empty_state_headline(&self) -> SharedString {
+        self.name()
+    }
+
+    fn empty_state_message(&self) -> SharedString {
+        "Ask questions, edit files, run commands".into()
    }

    fn logo(&self) -> ui::IconName {
@@ -47,16 +51,20 @@ impl AgentServer for Gemini {
                settings.get::<AllAgentServersSettings>(None).gemini.clone()
            })?;

-            let Some(command) =
+            let Some(mut command) =
                AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx).await
            else {
                return Err(LoadError::NotInstalled {
                    error_message: "Failed to find Gemini CLI binary".into(),
                    install_message: "Install Gemini CLI".into(),
-                    install_command: "npm install -g @google/gemini-cli@latest".into()
+                    install_command: Self::install_command().into(),
                }.into());
            };

+            if let Some(api_key)= cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
+                command.env.get_or_insert_default().insert("GEMINI_API_KEY".to_owned(), api_key.key);
+            }
+
            let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
            if result.is_err() {
                let version_fut = util::command::new_smol_command(&command.path)
@@ -84,7 +92,7 @@ impl AgentServer for Gemini {
                            current_version
                        ).into(),
                        upgrade_message: "Upgrade Gemini CLI to latest".into(),
-                        upgrade_command: "npm install -g @google/gemini-cli@latest".into(),
+                        upgrade_command: Self::upgrade_command().into(),
                    }.into())
                }
            }
@@ -97,13 +105,27 @@ impl AgentServer for Gemini {
    }
 }

+impl Gemini {
+    pub fn binary_name() -> &'static str {
+        "gemini"
+    }
+
+    pub fn install_command() -> &'static str {
+        "npm install -g @google/gemini-cli@preview"
+    }
+
+    pub fn upgrade_command() -> &'static str {
+        "npm install -g @google/gemini-cli@preview"
+    }
+}
+
 #[cfg(test)]
 pub(crate) mod tests {
    use super::*;
    use crate::AgentServerCommand;
    use std::path::Path;

-    crate::common_e2e_tests!(Gemini, allow_option_id = "proceed_once");
+    crate::common_e2e_tests!(async |_, _, _| Gemini, allow_option_id = "proceed_once");

    pub fn local_command() -> AgentServerCommand {
        let cli_path = Path::new(env!("CARGO_MANIFEST_DIR"))
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -1,6 +1,7 @@
 use crate::AgentServerCommand;
 use anyhow::Result;
-use gpui::App;
+use collections::HashMap;
+use gpui::{App, SharedString};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};
@@ -13,9 +14,13 @@ pub fn init(cx: &mut App) {
 pub struct AllAgentServersSettings {
    pub gemini: Option<AgentServerSettings>,
    pub claude: Option<AgentServerSettings>,
+
+    /// Custom agent servers configured by the user
+    #[serde(flatten)]
+    pub custom: HashMap<SharedString, AgentServerSettings>,
 }

-#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug)]
+#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
 pub struct AgentServerSettings {
    #[serde(flatten)]
    pub command: AgentServerCommand,
@@ -29,13 +34,26 @@ impl settings::Settings for AllAgentServersSettings {
    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
        let mut settings = AllAgentServersSettings::default();

-        for AllAgentServersSettings { gemini, claude } in sources.defaults_and_customizations() {
+        for AllAgentServersSettings {
+            gemini,
+            claude,
+            custom,
+        } in sources.defaults_and_customizations()
+        {
            if gemini.is_some() {
                settings.gemini = gemini.clone();
            }
            if claude.is_some() {
                settings.claude = claude.clone();
            }
+
+            // Merge custom agents
+            for (name, config) in custom {
+                // Skip built-in agent names to avoid conflicts
+                if name != "gemini" && name != "claude" {
+                    settings.custom.insert(name.clone(), config.clone());
+                }
+            }
        }

        Ok(settings)
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -67,6 +67,7 @@ ordered-float.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 picker.workspace = true
+postage.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -108,62 +108,7 @@ impl ContextPickerCompletionProvider {
                confirm: Some(Arc::new(|_, _, _| true)),
            }),
            ContextPickerEntry::Action(action) => {
-                let (new_text, on_action) = match action {
-                    ContextPickerAction::AddSelections => {
-                        const PLACEHOLDER: &str = "selection ";
-                        let selections = selection_ranges(workspace, cx)
-                            .into_iter()
-                            .enumerate()
-                            .map(|(ix, (buffer, range))| {
-                                (
-                                    buffer,
-                                    range,
-                                    (PLACEHOLDER.len() * ix)..(PLACEHOLDER.len() * (ix + 1) - 1),
-                                )
-                            })
-                            .collect::<Vec<_>>();
-
-                        let new_text: String = PLACEHOLDER.repeat(selections.len());
-
-                        let callback = Arc::new({
-                            let source_range = source_range.clone();
-                            move |_, window: &mut Window, cx: &mut App| {
-                                let selections = selections.clone();
-                                let message_editor = message_editor.clone();
-                                let source_range = source_range.clone();
-                                window.defer(cx, move |window, cx| {
-                                    message_editor
-                                        .update(cx, |message_editor, cx| {
-                                            message_editor.confirm_mention_for_selection(
-                                                source_range,
-                                                selections,
-                                                window,
-                                                cx,
-                                            )
-                                        })
-                                        .ok();
-                                });
-                                false
-                            }
-                        });
-
-                        (new_text, callback)
-                    }
-                };
-
-                Some(Completion {
-                    replace_range: source_range,
-                    new_text,
-                    label: CodeLabel::plain(action.label().to_string(), None),
-                    icon_path: Some(action.icon().path().into()),
-                    documentation: None,
-                    source: project::CompletionSource::Custom,
-                    insert_text_mode: None,
-                    // This ensures that when a user accepts this completion, the
-                    // completion menu will still be shown after "@category " is
-                    // inserted
-                    confirm: Some(on_action),
-                })
+                Self::completion_for_action(action, source_range, message_editor, workspace, cx)
            }
        }
    }
@@ -302,9 +247,9 @@ impl ContextPickerCompletionProvider {

        let abs_path = project.read(cx).absolute_path(&symbol.path, cx)?;
        let uri = MentionUri::Symbol {
-            path: abs_path,
+            abs_path,
            name: symbol.name.clone(),
-            line_range: symbol.range.start.0.row..symbol.range.end.0.row,
+            line_range: symbol.range.start.0.row..=symbol.range.end.0.row,
        };
        let new_text = format!("{} ", uri.as_link());
        let new_text_len = new_text.len();
@@ -359,6 +304,71 @@ impl ContextPickerCompletionProvider {
        })
    }

+    pub(crate) fn completion_for_action(
+        action: ContextPickerAction,
+        source_range: Range<Anchor>,
+        message_editor: WeakEntity<MessageEditor>,
+        workspace: &Entity<Workspace>,
+        cx: &mut App,
+    ) -> Option<Completion> {
+        let (new_text, on_action) = match action {
+            ContextPickerAction::AddSelections => {
+                const PLACEHOLDER: &str = "selection ";
+                let selections = selection_ranges(workspace, cx)
+                    .into_iter()
+                    .enumerate()
+                    .map(|(ix, (buffer, range))| {
+                        (
+                            buffer,
+                            range,
+                            (PLACEHOLDER.len() * ix)..(PLACEHOLDER.len() * (ix + 1) - 1),
+                        )
+                    })
+                    .collect::<Vec<_>>();
+
+                let new_text: String = PLACEHOLDER.repeat(selections.len());
+
+                let callback = Arc::new({
+                    let source_range = source_range.clone();
+                    move |_, window: &mut Window, cx: &mut App| {
+                        let selections = selections.clone();
+                        let message_editor = message_editor.clone();
+                        let source_range = source_range.clone();
+                        window.defer(cx, move |window, cx| {
+                            message_editor
+                                .update(cx, |message_editor, cx| {
+                                    message_editor.confirm_mention_for_selection(
+                                        source_range,
+                                        selections,
+                                        window,
+                                        cx,
+                                    )
+                                })
+                                .ok();
+                        });
+                        false
+                    }
+                });
+
+                (new_text, callback)
+            }
+        };
+
+        Some(Completion {
+            replace_range: source_range,
+            new_text,
+            label: CodeLabel::plain(action.label().to_string(), None),
+            icon_path: Some(action.icon().path().into()),
+            documentation: None,
+            source: project::CompletionSource::Custom,
+            insert_text_mode: None,
+            // This ensures that when a user accepts this completion, the
+            // completion menu will still be shown after "@category " is
+            // inserted
+            confirm: Some(on_action),
+        })
+    }
+
    fn search(
        &self,
        mode: Option<ContextPickerMode>,
@@ -795,7 +805,7 @@ pub(crate) fn search_threads(
    history_store: &Entity<HistoryStore>,
    cx: &mut App,
 ) -> Task<Vec<HistoryEntry>> {
-    let threads = history_store.read(cx).entries(cx);
+    let threads = history_store.read(cx).entries().collect();
    if query.is_empty() {
        return Task::ready(threads);
    }
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -1,6 +1,7 @@
-use std::ops::Range;
+use std::{cell::Cell, ops::Range, rc::Rc};

 use acp_thread::{AcpThread, AgentThreadEntry};
+use agent_client_protocol::{PromptCapabilities, ToolCallId};
 use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
@@ -26,6 +27,7 @@ pub struct EntryViewState {
    prompt_store: Option<Entity<PromptStore>>,
    entries: Vec<Entry>,
    prevent_slash_commands: bool,
+    prompt_capabilities: Rc<Cell<PromptCapabilities>>,
 }

 impl EntryViewState {
@@ -34,6 +36,7 @@ impl EntryViewState {
        project: Entity<Project>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
+        prompt_capabilities: Rc<Cell<PromptCapabilities>>,
        prevent_slash_commands: bool,
    ) -> Self {
        Self {
@@ -43,6 +46,7 @@ impl EntryViewState {
            prompt_store,
            entries: Vec::new(),
            prevent_slash_commands,
+            prompt_capabilities,
        }
    }

@@ -63,7 +67,7 @@ impl EntryViewState {

        match thread_entry {
            AgentThreadEntry::UserMessage(message) => {
-                let has_id = message.id.is_some();
+                let has_id = message.prompt_id.is_some();
                let chunks = message.chunks.clone();
                if let Some(Entry::UserMessage(editor)) = self.entries.get_mut(index) {
                    if !editor.focus_handle(cx).is_focused(window) {
@@ -80,6 +84,7 @@ impl EntryViewState {
                            self.project.clone(),
                            self.history_store.clone(),
                            self.prompt_store.clone(),
+                            self.prompt_capabilities.clone(),
                            "Edit message － @ to include context",
                            self.prevent_slash_commands,
                            editor::EditorMode::AutoHeight {
@@ -106,6 +111,7 @@ impl EntryViewState {
                }
            }
            AgentThreadEntry::ToolCall(tool_call) => {
+                let id = tool_call.id.clone();
                let terminals = tool_call.terminals().cloned().collect::<Vec<_>>();
                let diffs = tool_call.diffs().cloned().collect::<Vec<_>>();

@@ -121,21 +127,31 @@ impl EntryViewState {

                for terminal in terminals {
                    views.entry(terminal.entity_id()).or_insert_with(|| {
-                        create_terminal(
+                        let element = create_terminal(
                            self.workspace.clone(),
                            self.project.clone(),
                            terminal.clone(),
                            window,
                            cx,
                        )
-                        .into_any()
+                        .into_any();
+                        cx.emit(EntryViewEvent {
+                            entry_index: index,
+                            view_event: ViewEvent::NewTerminal(id.clone()),
+                        });
+                        element
                    });
                }

                for diff in diffs {
-                    views
-                        .entry(diff.entity_id())
-                        .or_insert_with(|| create_editor_diff(diff.clone(), window, cx).into_any());
+                    views.entry(diff.entity_id()).or_insert_with(|| {
+                        let element = create_editor_diff(diff.clone(), window, cx).into_any();
+                        cx.emit(EntryViewEvent {
+                            entry_index: index,
+                            view_event: ViewEvent::NewDiff(id.clone()),
+                        });
+                        element
+                    });
                }
            }
            AgentThreadEntry::AssistantMessage(_) => {
@@ -187,6 +203,8 @@ pub struct EntryViewEvent {
 }

 pub enum ViewEvent {
+    NewDiff(ToolCallId),
+    NewTerminal(ToolCallId),
    MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
 }

@@ -389,6 +407,7 @@ mod tests {
                project.clone(),
                history_store,
                None,
+                Default::default(),
                false,
            )
        });
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ b/crates/agent_ui/src/acp/thread_history.rs
@@ -1,19 +1,20 @@
-use crate::RemoveSelectedThread;
+use crate::acp::AcpThreadView;
+use crate::{AgentPanel, RemoveSelectedThread};
 use agent2::{HistoryEntry, HistoryStore};
 use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
 use editor::{Editor, EditorEvent};
-use fuzzy::{StringMatch, StringMatchCandidate};
+use fuzzy::StringMatchCandidate;
 use gpui::{
-    App, Empty, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
-    UniformListScrollHandle, Window, uniform_list,
+    App, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
+    UniformListScrollHandle, WeakEntity, Window, uniform_list,
 };
-use std::{fmt::Display, ops::Range, sync::Arc};
+use std::{fmt::Display, ops::Range};
+use text::Bias;
 use time::{OffsetDateTime, UtcOffset};
 use ui::{
    HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Scrollbar, ScrollbarState,
    Tooltip, prelude::*,
 };
-use util::ResultExt;

 pub struct AcpThreadHistory {
    pub(crate) history_store: Entity<HistoryStore>,
@@ -21,38 +22,38 @@ pub struct AcpThreadHistory {
    selected_index: usize,
    hovered_index: Option<usize>,
    search_editor: Entity<Editor>,
-    all_entries: Arc<Vec<HistoryEntry>>,
-    // When the search is empty, we display date separators between history entries
-    // This vector contains an enum of either a separator or an actual entry
-    separated_items: Vec<ListItemType>,
-    // Maps entry indexes to list item indexes
-    separated_item_indexes: Vec<u32>,
-    _separated_items_task: Option<Task<()>>,
-    search_state: SearchState,
+    search_query: SharedString,
+
+    visible_items: Vec<ListItemType>,
+
    scrollbar_visibility: bool,
    scrollbar_state: ScrollbarState,
    local_timezone: UtcOffset,
-    _subscriptions: Vec<gpui::Subscription>,
-}

-enum SearchState {
-    Empty,
-    Searching {
-        query: SharedString,
-        _task: Task<()>,
-    },
-    Searched {
-        query: SharedString,
-        matches: Vec<StringMatch>,
-    },
+    _update_task: Task<()>,
+    _subscriptions: Vec<gpui::Subscription>,
 }

 enum ListItemType {
    BucketSeparator(TimeBucket),
    Entry {
-        index: usize,
+        entry: HistoryEntry,
        format: EntryTimeFormat,
    },
+    SearchResult {
+        entry: HistoryEntry,
+        positions: Vec<usize>,
+    },
+}
+
+impl ListItemType {
+    fn history_entry(&self) -> Option<&HistoryEntry> {
+        match self {
+            ListItemType::Entry { entry, .. } => Some(entry),
+            ListItemType::SearchResult { entry, .. } => Some(entry),
+            _ => None,
+        }
+    }
 }

 pub enum ThreadHistoryEvent {
@@ -77,12 +78,15 @@ impl AcpThreadHistory {
            cx.subscribe(&search_editor, |this, search_editor, event, cx| {
                if let EditorEvent::BufferEdited = event {
                    let query = search_editor.read(cx).text(cx);
-                    this.search(query.into(), cx);
+                    if this.search_query != query {
+                        this.search_query = query.into();
+                        this.update_visible_items(false, cx);
+                    }
                }
            });

        let history_store_subscription = cx.observe(&history_store, |this, _, cx| {
-            this.update_all_entries(cx);
+            this.update_visible_items(true, cx);
        });

        let scroll_handle = UniformListScrollHandle::default();
@@ -93,10 +97,7 @@ impl AcpThreadHistory {
            scroll_handle,
            selected_index: 0,
            hovered_index: None,
-            search_state: SearchState::Empty,
-            all_entries: Default::default(),
-            separated_items: Default::default(),
-            separated_item_indexes: Default::default(),
+            visible_items: Default::default(),
            search_editor,
            scrollbar_visibility: true,
            scrollbar_state,
@@ -104,29 +105,61 @@ impl AcpThreadHistory {
                chrono::Local::now().offset().local_minus_utc(),
            )
            .unwrap(),
+            search_query: SharedString::default(),
            _subscriptions: vec![search_editor_subscription, history_store_subscription],
-            _separated_items_task: None,
+            _update_task: Task::ready(()),
        };
-        this.update_all_entries(cx);
+        this.update_visible_items(false, cx);
        this
    }

-    fn update_all_entries(&mut self, cx: &mut Context<Self>) {
-        let new_entries: Arc<Vec<HistoryEntry>> = self
+    fn update_visible_items(&mut self, preserve_selected_item: bool, cx: &mut Context<Self>) {
+        let entries = self
            .history_store
-            .update(cx, |store, cx| store.entries(cx))
-            .into();
+            .update(cx, |store, _| store.entries().collect());
+        let new_list_items = if self.search_query.is_empty() {
+            self.add_list_separators(entries, cx)
+        } else {
+            self.filter_search_results(entries, cx)
+        };
+        let selected_history_entry = if preserve_selected_item {
+            self.selected_history_entry().cloned()
+        } else {
+            None
+        };

-        self._separated_items_task.take();
+        self._update_task = cx.spawn(async move |this, cx| {
+            let new_visible_items = new_list_items.await;
+            this.update(cx, |this, cx| {
+                let new_selected_index = if let Some(history_entry) = selected_history_entry {
+                    let history_entry_id = history_entry.id();
+                    new_visible_items
+                        .iter()
+                        .position(|visible_entry| {
+                            visible_entry
+                                .history_entry()
+                                .is_some_and(|entry| entry.id() == history_entry_id)
+                        })
+                        .unwrap_or(0)
+                } else {
+                    0
+                };

-        let mut items = Vec::with_capacity(new_entries.len() + 1);
-        let mut indexes = Vec::with_capacity(new_entries.len() + 1);
+                this.visible_items = new_visible_items;
+                this.set_selected_index(new_selected_index, Bias::Right, cx);
+                cx.notify();
+            })
+            .ok();
+        });
+    }

-        let bg_task = cx.background_spawn(async move {
+    fn add_list_separators(&self, entries: Vec<HistoryEntry>, cx: &App) -> Task<Vec<ListItemType>> {
+        cx.background_spawn(async move {
+            let mut items = Vec::with_capacity(entries.len() + 1);
            let mut bucket = None;
            let today = Local::now().naive_local().date();

-            for (index, entry) in new_entries.iter().enumerate() {
+            for entry in entries.into_iter() {
                let entry_date = entry
                    .updated_at()
                    .with_timezone(&Local)
@@ -139,75 +172,33 @@ impl AcpThreadHistory {
                    items.push(ListItemType::BucketSeparator(entry_bucket));
                }

-                indexes.push(items.len() as u32);
                items.push(ListItemType::Entry {
-                    index,
+                    entry,
                    format: entry_bucket.into(),
                });
            }
-            (new_entries, items, indexes)
-        });
-
-        let task = cx.spawn(async move |this, cx| {
-            let (new_entries, items, indexes) = bg_task.await;
-            this.update(cx, |this, cx| {
-                let previously_selected_entry =
-                    this.all_entries.get(this.selected_index).map(|e| e.id());
-
-                this.all_entries = new_entries;
-                this.separated_items = items;
-                this.separated_item_indexes = indexes;
-
-                match &this.search_state {
-                    SearchState::Empty => {
-                        if this.selected_index >= this.all_entries.len() {
-                            this.set_selected_entry_index(
-                                this.all_entries.len().saturating_sub(1),
-                                cx,
-                            );
-                        } else if let Some(prev_id) = previously_selected_entry
-                            && let Some(new_ix) = this
-                                .all_entries
-                                .iter()
-                                .position(|probe| probe.id() == prev_id)
-                        {
-                            this.set_selected_entry_index(new_ix, cx);
-                        }
-                    }
-                    SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
-                        this.search(query.clone(), cx);
-                    }
-                }
-
-                cx.notify();
-            })
-            .log_err();
-        });
-        self._separated_items_task = Some(task);
+            items
+        })
    }

-    fn search(&mut self, query: SharedString, cx: &mut Context<Self>) {
-        if query.is_empty() {
-            self.search_state = SearchState::Empty;
-            cx.notify();
-            return;
-        }
-
-        let all_entries = self.all_entries.clone();
-
-        let fuzzy_search_task = cx.background_spawn({
-            let query = query.clone();
+    fn filter_search_results(
+        &self,
+        entries: Vec<HistoryEntry>,
+        cx: &App,
+    ) -> Task<Vec<ListItemType>> {
+        let query = self.search_query.clone();
+        cx.background_spawn({
            let executor = cx.background_executor().clone();
            async move {
-                let mut candidates = Vec::with_capacity(all_entries.len());
+                let mut candidates = Vec::with_capacity(entries.len());

-                for (idx, entry) in all_entries.iter().enumerate() {
+                for (idx, entry) in entries.iter().enumerate() {
                    candidates.push(StringMatchCandidate::new(idx, entry.title()));
                }

                const MAX_MATCHES: usize = 100;

-                fuzzy::match_strings(
+                let matches = fuzzy::match_strings(
                    &candidates,
                    &query,
                    false,
@@ -216,74 +207,61 @@ impl AcpThreadHistory {
                    &Default::default(),
                    executor,
                )
-                .await
+                .await;
+
+                matches
+                    .into_iter()
+                    .map(|search_match| ListItemType::SearchResult {
+                        entry: entries[search_match.candidate_id].clone(),
+                        positions: search_match.positions,
+                    })
+                    .collect()
            }
-        });
-
-        let task = cx.spawn({
-            let query = query.clone();
-            async move |this, cx| {
-                let matches = fuzzy_search_task.await;
-
-                this.update(cx, |this, cx| {
-                    let SearchState::Searching {
-                        query: current_query,
-                        _task,
-                    } = &this.search_state
-                    else {
-                        return;
-                    };
-
-                    if &query == current_query {
-                        this.search_state = SearchState::Searched {
-                            query: query.clone(),
-                            matches,
-                        };
-
-                        this.set_selected_entry_index(0, cx);
-                        cx.notify();
-                    };
-                })
-                .log_err();
-            }
-        });
-
-        self.search_state = SearchState::Searching { query, _task: task };
-        cx.notify();
-    }
-
-    fn matched_count(&self) -> usize {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.len(),
-            SearchState::Searching { .. } => 0,
-            SearchState::Searched { matches, .. } => matches.len(),
-        }
-    }
-
-    fn list_item_count(&self) -> usize {
-        match &self.search_state {
-            SearchState::Empty => self.separated_items.len(),
-            SearchState::Searching { .. } => 0,
-            SearchState::Searched { matches, .. } => matches.len(),
-        }
+        })
    }

    fn search_produced_no_matches(&self) -> bool {
-        match &self.search_state {
-            SearchState::Empty => false,
-            SearchState::Searching { .. } => false,
-            SearchState::Searched { matches, .. } => matches.is_empty(),
-        }
+        self.visible_items.is_empty() && !self.search_query.is_empty()
    }

-    fn get_match(&self, ix: usize) -> Option<&HistoryEntry> {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.get(ix),
-            SearchState::Searching { .. } => None,
-            SearchState::Searched { matches, .. } => matches
-                .get(ix)
-                .and_then(|m| self.all_entries.get(m.candidate_id)),
+    fn selected_history_entry(&self) -> Option<&HistoryEntry> {
+        self.get_history_entry(self.selected_index)
+    }
+
+    fn get_history_entry(&self, visible_items_ix: usize) -> Option<&HistoryEntry> {
+        self.visible_items.get(visible_items_ix)?.history_entry()
+    }
+
+    fn set_selected_index(&mut self, mut index: usize, bias: Bias, cx: &mut Context<Self>) {
+        if self.visible_items.len() == 0 {
+            self.selected_index = 0;
+            return;
        }
+        while matches!(
+            self.visible_items.get(index),
+            None | Some(ListItemType::BucketSeparator(..))
+        ) {
+            index = match bias {
+                Bias::Left => {
+                    if index == 0 {
+                        self.visible_items.len() - 1
+                    } else {
+                        index - 1
+                    }
+                }
+                Bias::Right => {
+                    if index >= self.visible_items.len() - 1 {
+                        0
+                    } else {
+                        index + 1
+                    }
+                }
+            };
+        }
+        self.selected_index = index;
+        self.scroll_handle
+            .scroll_to_item(index, ScrollStrategy::Top);
+        cx.notify()
    }

    pub fn select_previous(
@@ -292,13 +270,10 @@ impl AcpThreadHistory {
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let count = self.matched_count();
-        if count > 0 {
-            if self.selected_index == 0 {
-                self.set_selected_entry_index(count - 1, cx);
-            } else {
-                self.set_selected_entry_index(self.selected_index - 1, cx);
-            }
+        if self.selected_index == 0 {
+            self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
+        } else {
+            self.set_selected_index(self.selected_index - 1, Bias::Left, cx);
        }
    }

@@ -308,13 +283,10 @@ impl AcpThreadHistory {
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let count = self.matched_count();
-        if count > 0 {
-            if self.selected_index == count - 1 {
-                self.set_selected_entry_index(0, cx);
-            } else {
-                self.set_selected_entry_index(self.selected_index + 1, cx);
-            }
+        if self.selected_index == self.visible_items.len() - 1 {
+            self.set_selected_index(0, Bias::Right, cx);
+        } else {
+            self.set_selected_index(self.selected_index + 1, Bias::Right, cx);
        }
    }

@@ -324,35 +296,47 @@ impl AcpThreadHistory {
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let count = self.matched_count();
-        if count > 0 {
-            self.set_selected_entry_index(0, cx);
-        }
+        self.set_selected_index(0, Bias::Right, cx);
    }

    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.matched_count();
-        if count > 0 {
-            self.set_selected_entry_index(count - 1, cx);
-        }
+        self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
    }

-    fn set_selected_entry_index(&mut self, entry_index: usize, cx: &mut Context<Self>) {
-        self.selected_index = entry_index;
+    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
+        self.confirm_entry(self.selected_index, cx);
+    }

-        let scroll_ix = match self.search_state {
-            SearchState::Empty | SearchState::Searching { .. } => self
-                .separated_item_indexes
-                .get(entry_index)
-                .map(|ix| *ix as usize)
-                .unwrap_or(entry_index + 1),
-            SearchState::Searched { .. } => entry_index,
+    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
+        let Some(entry) = self.get_history_entry(ix) else {
+            return;
+        };
+        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
+    }
+
+    fn remove_selected_thread(
+        &mut self,
+        _: &RemoveSelectedThread,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.remove_thread(self.selected_index, cx)
+    }
+
+    fn remove_thread(&mut self, visible_item_ix: usize, cx: &mut Context<Self>) {
+        let Some(entry) = self.get_history_entry(visible_item_ix) else {
+            return;
        };

-        self.scroll_handle
-            .scroll_to_item(scroll_ix, ScrollStrategy::Top);
-
-        cx.notify();
+        let task = match entry {
+            HistoryEntry::AcpThread(thread) => self
+                .history_store
+                .update(cx, |this, cx| this.delete_thread(thread.id.clone(), cx)),
+            HistoryEntry::TextThread(context) => self.history_store.update(cx, |this, cx| {
+                this.delete_text_thread(context.path.clone(), cx)
+            }),
+        };
+        task.detach_and_log_err(cx);
    }

    fn render_scrollbar(&self, cx: &mut Context<Self>) -> Option<Stateful<Div>> {
@@ -392,91 +376,33 @@ impl AcpThreadHistory {
        )
    }

-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirm_entry(self.selected_index, cx);
-    }
-
-    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_match(ix) else {
-            return;
-        };
-        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
-    }
-
-    fn remove_selected_thread(
-        &mut self,
-        _: &RemoveSelectedThread,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_thread(self.selected_index, cx)
-    }
-
-    fn remove_thread(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_match(ix) else {
-            return;
-        };
-
-        let task = match entry {
-            HistoryEntry::AcpThread(thread) => self
-                .history_store
-                .update(cx, |this, cx| this.delete_thread(thread.id.clone(), cx)),
-            HistoryEntry::TextThread(context) => self.history_store.update(cx, |this, cx| {
-                this.delete_text_thread(context.path.clone(), cx)
-            }),
-        };
-        task.detach_and_log_err(cx);
-    }
-
-    fn list_items(
+    fn render_list_items(
        &mut self,
        range: Range<usize>,
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Vec<AnyElement> {
-        match &self.search_state {
-            SearchState::Empty => self
-                .separated_items
-                .get(range)
-                .iter()
-                .flat_map(|items| {
-                    items
-                        .iter()
-                        .map(|item| self.render_list_item(item, vec![], cx))
-                })
-                .collect(),
-            SearchState::Searched { matches, .. } => matches[range]
-                .iter()
-                .filter_map(|m| {
-                    let entry = self.all_entries.get(m.candidate_id)?;
-                    Some(self.render_history_entry(
-                        entry,
-                        EntryTimeFormat::DateAndTime,
-                        m.candidate_id,
-                        m.positions.clone(),
-                        cx,
-                    ))
-                })
-                .collect(),
-            SearchState::Searching { .. } => {
-                vec![]
-            }
-        }
+        self.visible_items
+            .get(range.clone())
+            .into_iter()
+            .flatten()
+            .enumerate()
+            .map(|(ix, item)| self.render_list_item(item, range.start + ix, cx))
+            .collect()
    }

-    fn render_list_item(
-        &self,
-        item: &ListItemType,
-        highlight_positions: Vec<usize>,
-        cx: &Context<Self>,
-    ) -> AnyElement {
+    fn render_list_item(&self, item: &ListItemType, ix: usize, cx: &Context<Self>) -> AnyElement {
        match item {
-            ListItemType::Entry { index, format } => match self.all_entries.get(*index) {
-                Some(entry) => self
-                    .render_history_entry(entry, *format, *index, highlight_positions, cx)
-                    .into_any(),
-                None => Empty.into_any_element(),
-            },
+            ListItemType::Entry { entry, format } => self
+                .render_history_entry(entry, *format, ix, Vec::default(), cx)
+                .into_any(),
+            ListItemType::SearchResult { entry, positions } => self.render_history_entry(
+                entry,
+                EntryTimeFormat::DateAndTime,
+                ix,
+                positions.clone(),
+                cx,
+            ),
            ListItemType::BucketSeparator(bucket) => div()
                .px(DynamicSpacing::Base06.rems(cx))
                .pt_2()
@@ -494,12 +420,12 @@ impl AcpThreadHistory {
        &self,
        entry: &HistoryEntry,
        format: EntryTimeFormat,
-        list_entry_ix: usize,
+        ix: usize,
        highlight_positions: Vec<usize>,
        cx: &Context<Self>,
    ) -> AnyElement {
-        let selected = list_entry_ix == self.selected_index;
-        let hovered = Some(list_entry_ix) == self.hovered_index;
+        let selected = ix == self.selected_index;
+        let hovered = Some(ix) == self.hovered_index;
        let timestamp = entry.updated_at().timestamp();
        let thread_timestamp = format.format_timestamp(timestamp, self.local_timezone);

@@ -507,7 +433,7 @@ impl AcpThreadHistory {
            .w_full()
            .pb_1()
            .child(
-                ListItem::new(list_entry_ix)
+                ListItem::new(ix)
                    .rounded()
                    .toggle_state(selected)
                    .spacing(ListItemSpacing::Sparse)
@@ -529,14 +455,14 @@ impl AcpThreadHistory {
                    )
                    .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
                        if *is_hovered {
-                            this.hovered_index = Some(list_entry_ix);
-                        } else if this.hovered_index == Some(list_entry_ix) {
+                            this.hovered_index = Some(ix);
+                        } else if this.hovered_index == Some(ix) {
                            this.hovered_index = None;
                        }

                        cx.notify();
                    }))
-                    .end_slot::<IconButton>(if hovered || selected {
+                    .end_slot::<IconButton>(if hovered {
                        Some(
                            IconButton::new("delete", IconName::Trash)
                                .shape(IconButtonShape::Square)
@@ -545,16 +471,14 @@ impl AcpThreadHistory {
                                .tooltip(move |window, cx| {
                                    Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
                                })
-                                .on_click(cx.listener(move |this, _, _, cx| {
-                                    this.remove_thread(list_entry_ix, cx)
-                                })),
+                                .on_click(
+                                    cx.listener(move |this, _, _, cx| this.remove_thread(ix, cx)),
+                                ),
                        )
                    } else {
                        None
                    })
-                    .on_click(
-                        cx.listener(move |this, _, _, cx| this.confirm_entry(list_entry_ix, cx)),
-                    ),
+                    .on_click(cx.listener(move |this, _, _, cx| this.confirm_entry(ix, cx))),
            )
            .into_any_element()
    }
@@ -577,7 +501,7 @@ impl Render for AcpThreadHistory {
            .on_action(cx.listener(Self::select_last))
            .on_action(cx.listener(Self::confirm))
            .on_action(cx.listener(Self::remove_selected_thread))
-            .when(!self.all_entries.is_empty(), |parent| {
+            .when(!self.history_store.read(cx).is_empty(cx), |parent| {
                parent.child(
                    h_flex()
                        .h(px(41.)) // Match the toolbar perfectly
@@ -603,7 +527,7 @@ impl Render for AcpThreadHistory {
                    .overflow_hidden()
                    .flex_grow();

-                if self.all_entries.is_empty() {
+                if self.history_store.read(cx).is_empty(cx) {
                    view.justify_center()
                        .child(
                            h_flex().w_full().justify_center().child(
@@ -622,9 +546,9 @@ impl Render for AcpThreadHistory {
                        .child(
                            uniform_list(
                                "thread-history",
-                                self.list_item_count(),
+                                self.visible_items.len(),
                                cx.processor(|this, range: Range<usize>, window, cx| {
-                                    this.list_items(range, window, cx)
+                                    this.render_list_items(range, window, cx)
                                }),
                            )
                            .p_1()
@@ -639,6 +563,141 @@ impl Render for AcpThreadHistory {
    }
 }

+#[derive(IntoElement)]
+pub struct AcpHistoryEntryElement {
+    entry: HistoryEntry,
+    thread_view: WeakEntity<AcpThreadView>,
+    selected: bool,
+    hovered: bool,
+    on_hover: Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>,
+}
+
+impl AcpHistoryEntryElement {
+    pub fn new(entry: HistoryEntry, thread_view: WeakEntity<AcpThreadView>) -> Self {
+        Self {
+            entry,
+            thread_view,
+            selected: false,
+            hovered: false,
+            on_hover: Box::new(|_, _, _| {}),
+        }
+    }
+
+    pub fn hovered(mut self, hovered: bool) -> Self {
+        self.hovered = hovered;
+        self
+    }
+
+    pub fn on_hover(mut self, on_hover: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
+        self.on_hover = Box::new(on_hover);
+        self
+    }
+}
+
+impl RenderOnce for AcpHistoryEntryElement {
+    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
+        let id = self.entry.id();
+        let title = self.entry.title();
+        let timestamp = self.entry.updated_at();
+
+        let formatted_time = {
+            let now = chrono::Utc::now();
+            let duration = now.signed_duration_since(timestamp);
+
+            if duration.num_days() > 0 {
+                format!("{}d", duration.num_days())
+            } else if duration.num_hours() > 0 {
+                format!("{}h ago", duration.num_hours())
+            } else if duration.num_minutes() > 0 {
+                format!("{}m ago", duration.num_minutes())
+            } else {
+                "Just now".to_string()
+            }
+        };
+
+        ListItem::new(id)
+            .rounded()
+            .toggle_state(self.selected)
+            .spacing(ListItemSpacing::Sparse)
+            .start_slot(
+                h_flex()
+                    .w_full()
+                    .gap_2()
+                    .justify_between()
+                    .child(Label::new(title).size(LabelSize::Small).truncate())
+                    .child(
+                        Label::new(formatted_time)
+                            .color(Color::Muted)
+                            .size(LabelSize::XSmall),
+                    ),
+            )
+            .on_hover(self.on_hover)
+            .end_slot::<IconButton>(if self.hovered || self.selected {
+                Some(
+                    IconButton::new("delete", IconName::Trash)
+                        .shape(IconButtonShape::Square)
+                        .icon_size(IconSize::XSmall)
+                        .icon_color(Color::Muted)
+                        .tooltip(move |window, cx| {
+                            Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
+                        })
+                        .on_click({
+                            let thread_view = self.thread_view.clone();
+                            let entry = self.entry.clone();
+
+                            move |_event, _window, cx| {
+                                if let Some(thread_view) = thread_view.upgrade() {
+                                    thread_view.update(cx, |thread_view, cx| {
+                                        thread_view.delete_history_entry(entry.clone(), cx);
+                                    });
+                                }
+                            }
+                        }),
+                )
+            } else {
+                None
+            })
+            .on_click({
+                let thread_view = self.thread_view.clone();
+                let entry = self.entry;
+
+                move |_event, window, cx| {
+                    if let Some(workspace) = thread_view
+                        .upgrade()
+                        .and_then(|view| view.read(cx).workspace().upgrade())
+                    {
+                        match &entry {
+                            HistoryEntry::AcpThread(thread_metadata) => {
+                                if let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) {
+                                    panel.update(cx, |panel, cx| {
+                                        panel.load_agent_thread(
+                                            thread_metadata.clone(),
+                                            window,
+                                            cx,
+                                        );
+                                    });
+                                }
+                            }
+                            HistoryEntry::TextThread(context) => {
+                                if let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) {
+                                    panel.update(cx, |panel, cx| {
+                                        panel
+                                            .open_saved_prompt_editor(
+                                                context.path.clone(),
+                                                window,
+                                                cx,
+                                            )
+                                            .detach_and_log_err(cx);
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
+            })
+    }
+}
+
 #[derive(Clone, Copy)]
 pub enum EntryTimeFormat {
    DateAndTime,
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1595,11 +1595,6 @@ impl ActiveThread {
            return;
        };

-        if model.provider.must_accept_terms(cx) {
-            cx.notify();
-            return;
-        }
-
        let edited_text = state.editor.read(cx).text(cx);

        let creases = state.editor.update(cx, extract_message_creases);
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -5,6 +5,7 @@ mod tool_picker;

 use std::{sync::Arc, time::Duration};

+use agent_servers::{AgentServerCommand, AllAgentServersSettings, Gemini};
 use agent_settings::AgentSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use cloud_llm_client::Plan;
@@ -15,7 +16,7 @@ use extension_host::ExtensionStore;
 use fs::Fs;
 use gpui::{
    Action, Animation, AnimationExt as _, AnyView, App, Corner, Entity, EventEmitter, FocusHandle,
-    Focusable, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
+    Focusable, Hsla, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
 };
 use language::LanguageRegistry;
 use language_model::{
@@ -23,10 +24,11 @@ use language_model::{
 };
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
+    Project,
    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
    project_settings::{ContextServerSettings, ProjectSettings},
 };
-use settings::{Settings, update_settings_file};
+use settings::{Settings, SettingsStore, update_settings_file};
 use ui::{
    Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
    Scrollbar, ScrollbarState, Switch, SwitchColor, SwitchField, Tooltip, prelude::*,
@@ -39,7 +41,7 @@ pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
 pub(crate) use manage_profiles_modal::ManageProfilesModal;

 use crate::{
-    AddContextServer,
+    AddContextServer, ExternalAgent, NewExternalAgentThread,
    agent_configuration::add_llm_provider_modal::{AddLlmProviderModal, LlmCompatibleProvider},
 };

@@ -47,6 +49,7 @@ pub struct AgentConfiguration {
    fs: Arc<dyn Fs>,
    language_registry: Arc<LanguageRegistry>,
    workspace: WeakEntity<Workspace>,
+    project: WeakEntity<Project>,
    focus_handle: FocusHandle,
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
    context_server_store: Entity<ContextServerStore>,
@@ -56,6 +59,8 @@ pub struct AgentConfiguration {
    _registry_subscription: Subscription,
    scroll_handle: ScrollHandle,
    scrollbar_state: ScrollbarState,
+    gemini_is_installed: bool,
+    _check_for_gemini: Task<()>,
 }

 impl AgentConfiguration {
@@ -65,6 +70,7 @@ impl AgentConfiguration {
        tools: Entity<ToolWorkingSet>,
        language_registry: Arc<LanguageRegistry>,
        workspace: WeakEntity<Workspace>,
+        project: WeakEntity<Project>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -89,33 +95,34 @@ impl AgentConfiguration {

        cx.subscribe(&context_server_store, |_, _, _, cx| cx.notify())
            .detach();
+        cx.observe_global_in::<SettingsStore>(window, |this, _, cx| {
+            this.check_for_gemini(cx);
+            cx.notify();
+        })
+        .detach();

        let scroll_handle = ScrollHandle::new();
        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());

-        let mut expanded_provider_configurations = HashMap::default();
-        if LanguageModelRegistry::read_global(cx)
-            .provider(&ZED_CLOUD_PROVIDER_ID)
-            .is_some_and(|cloud_provider| cloud_provider.must_accept_terms(cx))
-        {
-            expanded_provider_configurations.insert(ZED_CLOUD_PROVIDER_ID, true);
-        }
-
        let mut this = Self {
            fs,
            language_registry,
            workspace,
+            project,
            focus_handle,
            configuration_views_by_provider: HashMap::default(),
            context_server_store,
            expanded_context_server_tools: HashMap::default(),
-            expanded_provider_configurations,
+            expanded_provider_configurations: HashMap::default(),
            tools,
            _registry_subscription: registry_subscription,
            scroll_handle,
            scrollbar_state,
+            gemini_is_installed: false,
+            _check_for_gemini: Task::ready(()),
        };
        this.build_provider_configuration_views(window, cx);
+        this.check_for_gemini(cx);
        this
    }

@@ -145,6 +152,34 @@ impl AgentConfiguration {
        self.configuration_views_by_provider
            .insert(provider.id(), configuration_view);
    }
+
+    fn check_for_gemini(&mut self, cx: &mut Context<Self>) {
+        let project = self.project.clone();
+        let settings = AllAgentServersSettings::get_global(cx).clone();
+        self._check_for_gemini = cx.spawn({
+            async move |this, cx| {
+                let Some(project) = project.upgrade() else {
+                    return;
+                };
+                let gemini_is_installed = AgentServerCommand::resolve(
+                    Gemini::binary_name(),
+                    &[],
+                    // TODO expose fallback path from the Gemini/CC types so we don't have to hardcode it again here
+                    None,
+                    settings.gemini,
+                    &project,
+                    cx,
+                )
+                .await
+                .is_some();
+                this.update(cx, |this, cx| {
+                    this.gemini_is_installed = gemini_is_installed;
+                    cx.notify();
+                })
+                .ok();
+            }
+        });
+    }
 }

 impl Focusable for AgentConfiguration {
@@ -192,7 +227,7 @@ impl AgentConfiguration {
        let is_signed_in = self
            .workspace
            .read_with(cx, |workspace, _| {
-                workspace.client().status().borrow().is_connected()
+                !workspace.client().status().borrow().is_signed_out()
            })
            .unwrap_or(false);

@@ -219,7 +254,6 @@ impl AgentConfiguration {
                    .child(
                        h_flex()
                            .id(provider_id_string.clone())
-                            .cursor_pointer()
                            .px_2()
                            .py_0p5()
                            .w_full()
@@ -239,10 +273,7 @@ impl AgentConfiguration {
                                        h_flex()
                                            .w_full()
                                            .gap_1()
-                                            .child(
-                                                Label::new(provider_name.clone())
-                                                    .size(LabelSize::Large),
-                                            )
+                                            .child(Label::new(provider_name.clone()))
                                            .map(|this| {
                                                if is_zed_provider && is_signed_in {
                                                    this.child(
@@ -287,7 +318,7 @@ impl AgentConfiguration {
                                "Start New Thread",
                            )
                            .icon_position(IconPosition::Start)
-                            .icon(IconName::Plus)
+                            .icon(IconName::Thread)
                            .icon_size(IconSize::Small)
                            .icon_color(Color::Muted)
                            .label_size(LabelSize::Small)
@@ -386,7 +417,7 @@ impl AgentConfiguration {
                                    ),
                            )
                            .child(
-                                Label::new("Add at least one provider to use AI-powered features.")
+                                Label::new("Add at least one provider to use AI-powered features with Zed's native agent.")
                                    .color(Color::Muted),
                            ),
                    ),
@@ -527,6 +558,14 @@ 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)
+    }
+
    fn render_context_servers_section(
        &mut self,
        window: &mut Window,
@@ -544,7 +583,12 @@ impl AgentConfiguration {
                v_flex()
                    .gap_0p5()
                    .child(Headline::new("Model Context Protocol (MCP) Servers"))
-                    .child(Label::new("Connect to context servers through the Model Context Protocol, either using Zed extensions or directly.").color(Color::Muted)),
+                    .child(
+                        Label::new(
+                            "All context servers connected through the Model Context Protocol.",
+                        )
+                        .color(Color::Muted),
+                    ),
            )
            .children(
                context_server_ids.into_iter().map(|context_server_id| {
@@ -554,7 +598,7 @@ impl AgentConfiguration {
            .child(
                h_flex()
                    .justify_between()
-                    .gap_2()
+                    .gap_1p5()
                    .child(
                        h_flex().w_full().child(
                            Button::new("add-context-server", "Add Custom Server")
@@ -645,8 +689,6 @@ impl AgentConfiguration {
            .map_or([].as_slice(), |tools| tools.as_slice());
        let tool_count = tools.len();

-        let border_color = cx.theme().colors().border.opacity(0.6);
-
        let (source_icon, source_tooltip) = if is_from_extension {
            (
                IconName::ZedMcpExtension,
@@ -789,8 +831,8 @@ impl AgentConfiguration {
            .id(item_id.clone())
            .border_1()
            .rounded_md()
-            .border_color(border_color)
-            .bg(cx.theme().colors().background.opacity(0.2))
+            .border_color(self.card_item_border_color(cx))
+            .bg(self.card_item_bg_color(cx))
            .overflow_hidden()
            .child(
                h_flex()
@@ -798,7 +840,11 @@ impl AgentConfiguration {
                    .justify_between()
                    .when(
                        error.is_some() || are_tools_expanded && tool_count >= 1,
-                        |element| element.border_b_1().border_color(border_color),
+                        |element| {
+                            element
+                                .border_b_1()
+                                .border_color(self.card_item_border_color(cx))
+                        },
                    )
                    .child(
                        h_flex()
@@ -980,6 +1026,166 @@ impl AgentConfiguration {
                ))
            })
    }
+
+    fn render_agent_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let settings = AllAgentServersSettings::get_global(cx).clone();
+        let user_defined_agents = settings
+            .custom
+            .iter()
+            .map(|(name, settings)| {
+                self.render_agent_server(
+                    IconName::Ai,
+                    name.clone(),
+                    ExternalAgent::Custom {
+                        name: name.clone(),
+                        settings: settings.clone(),
+                    },
+                    None,
+                    cx,
+                )
+                .into_any_element()
+            })
+            .collect::<Vec<_>>();
+
+        v_flex()
+            .border_b_1()
+            .border_color(cx.theme().colors().border)
+            .child(
+                v_flex()
+                    .p(DynamicSpacing::Base16.rems(cx))
+                    .pr(DynamicSpacing::Base20.rems(cx))
+                    .gap_2()
+                    .child(
+                        v_flex()
+                            .gap_0p5()
+                            .child(Headline::new("External Agents"))
+                            .child(
+                                Label::new(
+                                    "Use the full power of Zed's UI with your favorite agent, connected via the Agent Client Protocol.",
+                                )
+                                .color(Color::Muted),
+                            ),
+                    )
+                    .child(self.render_agent_server(
+                        IconName::AiGemini,
+                        "Gemini CLI",
+                        ExternalAgent::Gemini,
+                        (!self.gemini_is_installed).then_some(Gemini::install_command().into()),
+                        cx,
+                    ))
+                    // TODO add CC
+                    .children(user_defined_agents),
+            )
+    }
+
+    fn render_agent_server(
+        &self,
+        icon: IconName,
+        name: impl Into<SharedString>,
+        agent: ExternalAgent,
+        install_command: Option<SharedString>,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        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())),
+            )
+            .map(|this| {
+                if let Some(install_command) = install_command {
+                    this.child(
+                        Button::new(
+                            SharedString::from(format!("install_external_agent-{name}")),
+                            "Install Agent",
+                        )
+                        .label_size(LabelSize::Small)
+                        .icon(IconName::Plus)
+                        .icon_position(IconPosition::Start)
+                        .icon_size(IconSize::XSmall)
+                        .icon_color(Color::Muted)
+                        .tooltip(Tooltip::text(install_command.clone()))
+                        .on_click(cx.listener(
+                            move |this, _, window, cx| {
+                                let Some(project) = this.project.upgrade() else {
+                                    return;
+                                };
+                                let Some(workspace) = this.workspace.upgrade() else {
+                                    return;
+                                };
+                                let cwd = project.read(cx).first_project_directory(cx);
+                                let shell =
+                                    project.read(cx).terminal_settings(&cwd, cx).shell.clone();
+                                let spawn_in_terminal = task::SpawnInTerminal {
+                                    id: task::TaskId(install_command.to_string()),
+                                    full_label: install_command.to_string(),
+                                    label: install_command.to_string(),
+                                    command: Some(install_command.to_string()),
+                                    args: Vec::new(),
+                                    command_label: install_command.to_string(),
+                                    cwd,
+                                    env: Default::default(),
+                                    use_new_terminal: true,
+                                    allow_concurrent_runs: true,
+                                    reveal: Default::default(),
+                                    reveal_target: Default::default(),
+                                    hide: Default::default(),
+                                    shell,
+                                    show_summary: true,
+                                    show_command: true,
+                                    show_rerun: false,
+                                };
+                                let task = workspace.update(cx, |workspace, cx| {
+                                    workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
+                                });
+                                cx.spawn(async move |this, cx| {
+                                    task.await;
+                                    this.update(cx, |this, cx| {
+                                        this.check_for_gemini(cx);
+                                    })
+                                    .ok();
+                                })
+                                .detach();
+                            },
+                        )),
+                    )
+                } else {
+                    this.child(
+                        h_flex().gap_1().child(
+                            Button::new(
+                                SharedString::from(format!("start_acp_thread-{name}")),
+                                "Start New Thread",
+                            )
+                            .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,
+                                );
+                            }),
+                        ),
+                    )
+                }
+            })
+    }
 }

 impl Render for AgentConfiguration {
@@ -999,6 +1205,7 @@ impl Render for AgentConfiguration {
                    .size_full()
                    .overflow_y_scroll()
                    .child(self.render_general_settings_section(cx))
+                    .child(self.render_agent_servers_section(cx))
                    .child(self.render_context_servers_section(window, cx))
                    .child(self.render_provider_configuration_section(cx)),
            )
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1529,6 +1529,7 @@ impl AgentDiff {
            | AcpThreadEvent::TokenUsageUpdated
            | AcpThreadEvent::EntriesRemoved(_)
            | AcpThreadEvent::ToolAuthorizationRequired
+            | AcpThreadEvent::PromptCapabilitiesUpdated
            | AcpThreadEvent::Retry(_) => {}
        }
    }
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5,9 +5,12 @@ use std::sync::Arc;
 use std::time::Duration;

 use acp_thread::AcpThread;
+use agent_servers::AgentServerSettings;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
+use zed_actions::OpenBrowser;
+use zed_actions::agent::ReauthenticateAgent;

 use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
 use crate::agent_diff::AgentDiffThread;
@@ -54,9 +57,7 @@ use gpui::{
    Pixels, Subscription, Task, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,
 };
 use language::LanguageRegistry;
-use language_model::{
-    ConfigurationError, ConfiguredModel, LanguageModelProviderTosView, LanguageModelRegistry,
-};
+use language_model::{ConfigurationError, ConfiguredModel, LanguageModelRegistry};
 use project::{DisableAiSettings, Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
 use rules_library::{RulesLibrary, open_rules_library};
@@ -130,7 +131,7 @@ pub fn init(cx: &mut App) {
                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
-                            panel.external_thread(action.agent, None, None, window, cx)
+                            panel.external_thread(action.agent.clone(), None, None, window, cx)
                        });
                    }
                })
@@ -241,7 +242,8 @@ enum WhichFontSize {
    None,
 }

-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+// TODO unify this with ExternalAgent
+#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 pub enum AgentType {
    #[default]
    Zed,
@@ -249,23 +251,29 @@ pub enum AgentType {
    Gemini,
    ClaudeCode,
    NativeAgent,
+    Custom {
+        name: SharedString,
+        settings: AgentServerSettings,
+    },
 }

 impl AgentType {
-    fn label(self) -> impl Into<SharedString> {
+    fn label(&self) -> SharedString {
        match self {
-            Self::Zed | Self::TextThread => "Zed Agent",
-            Self::NativeAgent => "Agent 2",
-            Self::Gemini => "Gemini CLI",
-            Self::ClaudeCode => "Claude Code",
+            Self::Zed | Self::TextThread => "Zed Agent".into(),
+            Self::NativeAgent => "Agent 2".into(),
+            Self::Gemini => "Gemini CLI".into(),
+            Self::ClaudeCode => "Claude Code".into(),
+            Self::Custom { name, .. } => name.into(),
        }
    }

-    fn icon(self) -> Option<IconName> {
+    fn icon(&self) -> Option<IconName> {
        match self {
            Self::Zed | Self::NativeAgent | Self::TextThread => None,
            Self::Gemini => Some(IconName::AiGemini),
            Self::ClaudeCode => Some(IconName::AiClaude),
+            Self::Custom { .. } => Some(IconName::Terminal),
        }
    }
 }
@@ -519,7 +527,7 @@ pub struct AgentPanel {
 impl AgentPanel {
    fn serialize(&mut self, cx: &mut Context<Self>) {
        let width = self.width;
-        let selected_agent = self.selected_agent;
+        let selected_agent = self.selected_agent.clone();
        self.pending_serialization = Some(cx.background_spawn(async move {
            KEY_VALUE_STORE
                .write_kvp(
@@ -609,7 +617,7 @@ impl AgentPanel {
                    panel.update(cx, |panel, cx| {
                        panel.width = serialized_panel.width.map(|w| w.round());
                        if let Some(selected_agent) = serialized_panel.selected_agent {
-                            panel.selected_agent = selected_agent;
+                            panel.selected_agent = selected_agent.clone();
                            panel.new_agent_thread(selected_agent, window, cx);
                        }
                        cx.notify();
@@ -903,6 +911,16 @@ impl AgentPanel {
        }
    }

+    fn active_thread_view(&self) -> Option<&Entity<AcpThreadView>> {
+        match &self.active_view {
+            ActiveView::ExternalAgentThread { thread_view, .. } => Some(thread_view),
+            ActiveView::Thread { .. }
+            | ActiveView::TextThread { .. }
+            | ActiveView::History
+            | ActiveView::Configuration => None,
+        }
+    }
+
    fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
        if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
            return self.new_agent_thread(AgentType::NativeAgent, window, cx);
@@ -1009,6 +1027,8 @@ impl AgentPanel {
    }

    fn new_prompt_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        telemetry::event!("Agent Thread Started", agent = "zed-text");
+
        let context = self
            .context_store
            .update(cx, |context_store, cx| context_store.create(cx));
@@ -1069,14 +1089,17 @@ impl AgentPanel {
        cx.spawn_in(window, async move |this, cx| {
            let ext_agent = match agent_choice {
                Some(agent) => {
-                    cx.background_spawn(async move {
-                        if let Some(serialized) =
-                            serde_json::to_string(&LastUsedExternalAgent { agent }).log_err()
-                        {
-                            KEY_VALUE_STORE
-                                .write_kvp(LAST_USED_EXTERNAL_AGENT_KEY.to_string(), serialized)
-                                .await
-                                .log_err();
+                    cx.background_spawn({
+                        let agent = agent.clone();
+                        async move {
+                            if let Some(serialized) =
+                                serde_json::to_string(&LastUsedExternalAgent { agent }).log_err()
+                            {
+                                KEY_VALUE_STORE
+                                    .write_kvp(LAST_USED_EXTERNAL_AGENT_KEY.to_string(), serialized)
+                                    .await
+                                    .log_err();
+                            }
                        }
                    })
                    .detach();
@@ -1098,11 +1121,15 @@ impl AgentPanel {
                }
            };

+            telemetry::event!("Agent Thread Started", agent = ext_agent.name());
+
            let server = ext_agent.server(fs, history);

            this.update_in(cx, |this, window, cx| {
                match ext_agent {
-                    crate::ExternalAgent::Gemini | crate::ExternalAgent::NativeAgent => {
+                    crate::ExternalAgent::Gemini
+                    | crate::ExternalAgent::NativeAgent
+                    | crate::ExternalAgent::Custom { .. } => {
                        if !cx.has_flag::<GeminiAndNativeFeatureFlag>() {
                            return;
                        }
@@ -1453,6 +1480,7 @@ impl AgentPanel {
                tools,
                self.language_registry.clone(),
                self.workspace.clone(),
+                self.project.downgrade(),
                window,
                cx,
            )
@@ -1831,14 +1859,14 @@ impl AgentPanel {
        cx: &mut Context<Self>,
    ) {
        if self.selected_agent != agent {
-            self.selected_agent = agent;
+            self.selected_agent = agent.clone();
            self.serialize(cx);
        }
        self.new_agent_thread(agent, window, cx);
    }

    pub fn selected_agent(&self) -> AgentType {
-        self.selected_agent
+        self.selected_agent.clone()
    }

    pub fn new_agent_thread(
@@ -1877,6 +1905,13 @@ impl AgentPanel {
                window,
                cx,
            ),
+            AgentType::Custom { name, settings } => self.external_thread(
+                Some(crate::ExternalAgent::Custom { name, settings }),
+                None,
+                None,
+                window,
+                cx,
+            ),
        }
    }

@@ -2031,9 +2066,11 @@ impl AgentPanel {
                match state {
                    ThreadSummary::Pending => Label::new(ThreadSummary::DEFAULT)
                        .truncate()
+                        .color(Color::Muted)
                        .into_any_element(),
                    ThreadSummary::Generating => Label::new(LOADING_SUMMARY_PLACEHOLDER)
                        .truncate()
+                        .color(Color::Muted)
                        .into_any_element(),
                    ThreadSummary::Ready(_) => div()
                        .w_full()
@@ -2065,9 +2102,33 @@ impl AgentPanel {
                }
            }
            ActiveView::ExternalAgentThread { thread_view } => {
-                Label::new(thread_view.read(cx).title(cx))
-                    .truncate()
-                    .into_any_element()
+                if let Some(title_editor) = thread_view.read(cx).title_editor() {
+                    div()
+                        .w_full()
+                        .on_action({
+                            let thread_view = thread_view.downgrade();
+                            move |_: &menu::Confirm, window, cx| {
+                                if let Some(thread_view) = thread_view.upgrade() {
+                                    thread_view.focus_handle(cx).focus(window);
+                                }
+                            }
+                        })
+                        .on_action({
+                            let thread_view = thread_view.downgrade();
+                            move |_: &editor::actions::Cancel, window, cx| {
+                                if let Some(thread_view) = thread_view.upgrade() {
+                                    thread_view.focus_handle(cx).focus(window);
+                                }
+                            }
+                        })
+                        .child(title_editor)
+                        .into_any_element()
+                } else {
+                    Label::new(thread_view.read(cx).title())
+                        .color(Color::Muted)
+                        .truncate()
+                        .into_any_element()
+                }
            }
            ActiveView::TextThread {
                title_editor,
@@ -2078,6 +2139,7 @@ impl AgentPanel {

                match summary {
                    ContextSummary::Pending => Label::new(ContextSummary::DEFAULT)
+                        .color(Color::Muted)
                        .truncate()
                        .into_any_element(),
                    ContextSummary::Content(summary) => {
@@ -2089,6 +2151,7 @@ impl AgentPanel {
                        } else {
                            Label::new(LOADING_SUMMARY_PLACEHOLDER)
                                .truncate()
+                                .color(Color::Muted)
                                .into_any_element()
                        }
                    }
@@ -2149,6 +2212,8 @@ impl AgentPanel {
            "Enable Full Screen"
        };

+        let selected_agent = self.selected_agent.clone();
+
        PopoverMenu::new("agent-options-menu")
            .trigger_with_tooltip(
                IconButton::new("agent-options-menu", IconName::Ellipsis)
@@ -2228,6 +2293,11 @@ impl AgentPanel {
                            .action("Settings", Box::new(OpenSettings))
                            .separator()
                            .action(full_screen_label, Box::new(ToggleZoom));
+
+                        if selected_agent == AgentType::Gemini {
+                            menu = menu.action("Reauthenticate", Box::new(ReauthenticateAgent))
+                        }
+
                        menu
                    }))
                }
@@ -2262,6 +2332,8 @@ impl AgentPanel {
            .menu({
                let menu = self.assistant_navigation_menu.clone();
                move |window, cx| {
+                    telemetry::event!("View Thread History Clicked");
+
                    if let Some(menu) = menu.as_ref() {
                        menu.update(cx, |_, cx| {
                            cx.defer_in(window, |menu, window, cx| {
@@ -2440,6 +2512,8 @@ impl AgentPanel {
                let workspace = self.workspace.clone();

                move |window, cx| {
+                    telemetry::event!("New Thread Clicked");
+
                    let active_thread = active_thread.clone();
                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
                        menu = menu
@@ -2574,13 +2648,64 @@ impl AgentPanel {
                                            }
                                        }),
                                )
+                            })
+                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |mut menu| {
+                                // Add custom agents from settings
+                                let settings =
+                                    agent_servers::AllAgentServersSettings::get_global(cx);
+                                for (agent_name, agent_settings) in &settings.custom {
+                                    menu = menu.item(
+                                        ContextMenuEntry::new(format!("New {} Thread", agent_name))
+                                            .icon(IconName::Terminal)
+                                            .icon_color(Color::Muted)
+                                            .handler({
+                                                let workspace = workspace.clone();
+                                                let agent_name = agent_name.clone();
+                                                let agent_settings = agent_settings.clone();
+                                                move |window, cx| {
+                                                    if let Some(workspace) = workspace.upgrade() {
+                                                        workspace.update(cx, |workspace, cx| {
+                                                            if let Some(panel) =
+                                                                workspace.panel::<AgentPanel>(cx)
+                                                            {
+                                                                panel.update(cx, |panel, cx| {
+                                                                    panel.set_selected_agent(
+                                                                        AgentType::Custom {
+                                                                            name: agent_name
+                                                                                .clone(),
+                                                                            settings:
+                                                                                agent_settings
+                                                                                    .clone(),
+                                                                        },
+                                                                        window,
+                                                                        cx,
+                                                                    );
+                                                                });
+                                                            }
+                                                        });
+                                                    }
+                                                }
+                                            }),
+                                    );
+                                }
+
+                                menu
+                            })
+                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
+                                menu.separator().link(
+                                    "Add Your Own Agent",
+                                    OpenBrowser {
+                                        url: "https://agentclientprotocol.com/".into(),
+                                    }
+                                    .boxed_clone(),
+                                )
                            });
                        menu
                    }))
                }
            });

-        let selected_agent_label = self.selected_agent.label().into();
+        let selected_agent_label = self.selected_agent.label();
        let selected_agent = div()
            .id("selected_agent_icon")
            .when_some(self.selected_agent.icon(), |this, icon| {
@@ -3165,17 +3290,6 @@ impl AgentPanel {
            ConfigurationError::ModelNotFound
            | ConfigurationError::ProviderNotAuthenticated(_)
            | ConfigurationError::NoProvider => callout.into_any_element(),
-            ConfigurationError::ProviderPendingTermsAcceptance(provider) => {
-                Banner::new()
-                    .severity(Severity::Warning)
-                    .child(h_flex().w_full().children(
-                        provider.render_accept_terms(
-                            LanguageModelProviderTosView::ThreadEmptyState,
-                            cx,
-                        ),
-                    ))
-                    .into_any_element()
-            }
        }
    }

@@ -3665,6 +3779,11 @@ impl Render for AgentPanel {
                }
            }))
            .on_action(cx.listener(Self::toggle_burn_mode))
+            .on_action(cx.listener(|this, _: &ReauthenticateAgent, window, cx| {
+                if let Some(thread_view) = this.active_thread_view() {
+                    thread_view.update(cx, |thread_view, cx| thread_view.reauthenticate(window, cx))
+                }
+            }))
            .child(self.render_toolbar(window, cx))
            .children(self.render_onboarding(window, cx))
            .map(|parent| match &self.active_view {
@@ -3882,7 +4001,11 @@ impl AgentPanelDelegate for ConcreteAssistantPanelDelegate {
            // Wait to create a new context until the workspace is no longer
            // being updated.
            cx.defer_in(window, move |panel, window, cx| {
-                if let Some(message_editor) = panel.active_message_editor() {
+                if let Some(thread_view) = panel.active_thread_view() {
+                    thread_view.update(cx, |thread_view, cx| {
+                        thread_view.insert_selections(window, cx);
+                    });
+                } else if let Some(message_editor) = panel.active_message_editor() {
                    message_editor.update(cx, |message_editor, cx| {
                        message_editor.context_store().update(cx, |store, cx| {
                            let buffer = buffer.read(cx);
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -28,13 +28,14 @@ use std::rc::Rc;
 use std::sync::Arc;

 use agent::{Thread, ThreadId};
+use agent_servers::AgentServerSettings;
 use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
-use gpui::{Action, App, Entity, actions};
+use gpui::{Action, App, Entity, SharedString, actions};
 use language::LanguageRegistry;
 use language_model::{
    ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
@@ -128,6 +129,12 @@ actions!(
    ]
 );

+#[derive(Clone, Copy, Debug, PartialEq, Eq, Action)]
+#[action(namespace = agent)]
+#[action(deprecated_aliases = ["assistant::QuoteSelection"])]
+/// Quotes the current selection in the agent panel's message editor.
+pub struct QuoteSelection;
+
 /// Creates a new conversation thread, optionally based on an existing thread.
 #[derive(Default, Clone, PartialEq, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]
@@ -153,25 +160,43 @@ pub struct NewNativeAgentThreadFromSummary {
    from_session_id: agent_client_protocol::SessionId,
 }

-#[derive(Default, Debug, Clone, Copy, PartialEq, Serialize, Deserialize, JsonSchema)]
+// TODO unify this with AgentType
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 enum ExternalAgent {
    #[default]
    Gemini,
    ClaudeCode,
    NativeAgent,
+    Custom {
+        name: SharedString,
+        settings: AgentServerSettings,
+    },
 }

 impl ExternalAgent {
+    fn name(&self) -> &'static str {
+        match self {
+            Self::NativeAgent => "zed",
+            Self::Gemini => "gemini-cli",
+            Self::ClaudeCode => "claude-code",
+            Self::Custom { .. } => "custom",
+        }
+    }
+
    pub fn server(
        &self,
        fs: Arc<dyn fs::Fs>,
        history: Entity<agent2::HistoryStore>,
    ) -> Rc<dyn agent_servers::AgentServer> {
        match self {
-            ExternalAgent::Gemini => Rc::new(agent_servers::Gemini),
-            ExternalAgent::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
-            ExternalAgent::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
+            Self::Gemini => Rc::new(agent_servers::Gemini),
+            Self::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
+            Self::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
+            Self::Custom { name, settings } => Rc::new(agent_servers::CustomAgentServer::new(
+                name.clone(),
+                settings,
+            )),
        }
    }
 }
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -6,8 +6,7 @@ use feature_flags::ZedProFeatureFlag;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, Subscription, Task};
 use language_model::{
-    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProviderId,
-    LanguageModelRegistry,
+    ConfiguredModel, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
@@ -77,7 +76,6 @@ pub struct LanguageModelPickerDelegate {
    all_models: Arc<GroupedModels>,
    filtered_entries: Vec<LanguageModelPickerEntry>,
    selected_index: usize,
-    _authenticate_all_providers_task: Task<()>,
    _subscriptions: Vec<Subscription>,
 }

@@ -98,7 +96,6 @@ impl LanguageModelPickerDelegate {
            selected_index: Self::get_active_model_index(&entries, get_active_model(cx)),
            filtered_entries: entries,
            get_active_model: Arc::new(get_active_model),
-            _authenticate_all_providers_task: Self::authenticate_all_providers(cx),
            _subscriptions: vec![cx.subscribe_in(
                &LanguageModelRegistry::global(cx),
                window,
@@ -142,56 +139,6 @@ impl LanguageModelPickerDelegate {
            .unwrap_or(0)
    }

-    /// Authenticates all providers in the [`LanguageModelRegistry`].
-    ///
-    /// We do this so that we can populate the language selector with all of the
-    /// models from the configured providers.
-    fn authenticate_all_providers(cx: &mut App) -> Task<()> {
-        let authenticate_all_providers = LanguageModelRegistry::global(cx)
-            .read(cx)
-            .providers()
-            .iter()
-            .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
-            .collect::<Vec<_>>();
-
-        cx.spawn(async move |_cx| {
-            for (provider_id, provider_name, authenticate_task) in authenticate_all_providers {
-                if let Err(err) = authenticate_task.await {
-                    if matches!(err, AuthenticateError::CredentialsNotFound) {
-                        // Since we're authenticating these providers in the
-                        // background for the purposes of populating the
-                        // language selector, we don't care about providers
-                        // where the credentials are not found.
-                    } else {
-                        // Some providers have noisy failure states that we
-                        // don't want to spam the logs with every time the
-                        // language model selector is initialized.
-                        //
-                        // Ideally these should have more clear failure modes
-                        // that we know are safe to ignore here, like what we do
-                        // with `CredentialsNotFound` above.
-                        match provider_id.0.as_ref() {
-                            "lmstudio" | "ollama" => {
-                                // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
-                                //
-                                // These fail noisily, so we don't log them.
-                            }
-                            "copilot_chat" => {
-                                // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
-                            }
-                            _ => {
-                                log::error!(
-                                    "Failed to authenticate provider: {}: {err}",
-                                    provider_name.0
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        })
-    }
-
    pub fn active_model(&self, cx: &App) -> Option<ConfiguredModel> {
        (self.get_active_model)(cx)
    }
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -378,18 +378,13 @@ impl MessageEditor {
    }

    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, provider }) = self
+        let Some(ConfiguredModel { model, .. }) = self
            .thread
            .update(cx, |thread, cx| thread.get_or_init_configured_model(cx))
        else {
            return;
        };

-        if provider.must_accept_terms(cx) {
-            cx.notify();
-            return;
-        }
-
        let (user_message, user_message_creases) = self.editor.update(cx, |editor, cx| {
            let creases = extract_message_creases(editor, cx);
            let text = editor.text(cx);
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1,4 +1,5 @@
 use crate::{
+    QuoteSelection,
    language_model_selector::{LanguageModelSelector, language_model_selector},
    ui::BurnModeTooltip,
 };
@@ -89,8 +90,6 @@ actions!(
        CycleMessageRole,
        /// Inserts the selected text into the active editor.
        InsertIntoEditor,
-        /// Quotes the current selection in the assistant conversation.
-        QuoteSelection,
        /// Splits the conversation at the current cursor position.
        Split,
    ]
@@ -191,7 +190,6 @@ pub struct TextThreadEditor {
    invoked_slash_command_creases: HashMap<InvokedSlashCommandId, CreaseId>,
    _subscriptions: Vec<Subscription>,
    last_error: Option<AssistError>,
-    show_accept_terms: bool,
    pub(crate) slash_menu_handle:
        PopoverMenuHandle<Picker<slash_command_picker::SlashCommandDelegate>>,
    // dragged_file_worktrees is used to keep references to worktrees that were added
@@ -290,7 +288,6 @@ impl TextThreadEditor {
            invoked_slash_command_creases: HashMap::default(),
            _subscriptions,
            last_error: None,
-            show_accept_terms: false,
            slash_menu_handle: Default::default(),
            dragged_file_worktrees: Vec::new(),
            language_model_selector: cx.new(|cx| {
@@ -364,24 +361,12 @@ impl TextThreadEditor {
        if self.sending_disabled(cx) {
            return;
        }
+        telemetry::event!("Agent Message Sent", agent = "zed-text");
        self.send_to_model(window, cx);
    }

    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
-        if provider
-            .as_ref()
-            .is_some_and(|provider| provider.must_accept_terms(cx))
-        {
-            self.show_accept_terms = true;
-            cx.notify();
-            return;
-        }
-
        self.last_error = None;
-
        if let Some(user_message) = self.context.update(cx, |context, cx| context.assist(cx)) {
            let new_selection = {
                let cursor = user_message
@@ -1931,7 +1916,6 @@ impl TextThreadEditor {
            ConfigurationError::NoProvider
            | ConfigurationError::ModelNotFound
            | ConfigurationError::ProviderNotAuthenticated(_) => true,
-            ConfigurationError::ProviderPendingTermsAcceptance(_) => self.show_accept_terms,
        }
    }

--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -2,13 +2,13 @@ mod agent_notification;
 mod burn_mode_tooltip;
 mod context_pill;
 mod end_trial_upsell;
-// mod new_thread_button;
 mod onboarding_modal;
 pub mod preview;
+mod unavailable_editing_tooltip;

 pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
 pub use context_pill::*;
 pub use end_trial_upsell::*;
-// pub use new_thread_button::*;
 pub use onboarding_modal::*;
+pub use unavailable_editing_tooltip::*;
--- a/crates/agent_ui/src/ui/new_thread_button.rs
+++ b/crates/agent_ui/src/ui/new_thread_button.rs
@@ -1,75 +0,0 @@
-use gpui::{ClickEvent, ElementId, IntoElement, ParentElement, Styled};
-use ui::prelude::*;
-
-#[derive(IntoElement)]
-pub struct NewThreadButton {
-    id: ElementId,
-    label: SharedString,
-    icon: IconName,
-    keybinding: Option<ui::KeyBinding>,
-    on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-}
-
-impl NewThreadButton {
-    fn new(id: impl Into<ElementId>, label: impl Into<SharedString>, icon: IconName) -> Self {
-        Self {
-            id: id.into(),
-            label: label.into(),
-            icon,
-            keybinding: None,
-            on_click: None,
-        }
-    }
-
-    fn keybinding(mut self, keybinding: Option<ui::KeyBinding>) -> Self {
-        self.keybinding = keybinding;
-        self
-    }
-
-    fn on_click<F>(mut self, handler: F) -> Self
-    where
-        F: Fn(&mut Window, &mut App) + 'static,
-    {
-        self.on_click = Some(Box::new(
-            move |_: &ClickEvent, window: &mut Window, cx: &mut App| handler(window, cx),
-        ));
-        self
-    }
-}
-
-impl RenderOnce for NewThreadButton {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .id(self.id)
-            .w_full()
-            .py_1p5()
-            .px_2()
-            .gap_1()
-            .justify_between()
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border.opacity(0.4))
-            .bg(cx.theme().colors().element_active.opacity(0.2))
-            .hover(|style| {
-                style
-                    .bg(cx.theme().colors().element_hover)
-                    .border_color(cx.theme().colors().border)
-            })
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .child(
-                        Icon::new(self.icon)
-                            .size(IconSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .child(Label::new(self.label).size(LabelSize::Small)),
-            )
-            .when_some(self.keybinding, |this, keybinding| {
-                this.child(keybinding.size(rems_from_px(10.)))
-            })
-            .when_some(self.on_click, |this, on_click| {
-                this.on_click(move |event, window, cx| on_click(event, window, cx))
-            })
-    }
-}
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -86,23 +86,18 @@ impl RenderOnce for UsageCallout {
            (IconName::Warning, Severity::Warning)
        };

-        div()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                Callout::new()
-                    .icon(icon)
-                    .severity(severity)
-                    .icon(icon)
-                    .title(title)
-                    .description(message)
-                    .actions_slot(
-                        Button::new("upgrade", button_text)
-                            .label_size(LabelSize::Small)
-                            .on_click(move |_, _, cx| {
-                                cx.open_url(&url);
-                            }),
-                    ),
+        Callout::new()
+            .icon(icon)
+            .severity(severity)
+            .icon(icon)
+            .title(title)
+            .description(message)
+            .actions_slot(
+                Button::new("upgrade", button_text)
+                    .label_size(LabelSize::Small)
+                    .on_click(move |_, _, cx| {
+                        cx.open_url(&url);
+                    }),
            )
            .into_any_element()
    }
--- a/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
+++ b/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
@@ -0,0 +1,29 @@
+use gpui::{Context, IntoElement, Render, Window};
+use ui::{prelude::*, tooltip_container};
+
+pub struct UnavailableEditingTooltip {
+    agent_name: SharedString,
+}
+
+impl UnavailableEditingTooltip {
+    pub fn new(agent_name: SharedString) -> Self {
+        Self { agent_name }
+    }
+}
+
+impl Render for UnavailableEditingTooltip {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        tooltip_container(window, cx, |this, _, _| {
+            this.child(Label::new("Unavailable Editing")).child(
+                div().max_w_64().child(
+                    Label::new(format!(
+                        "Editing previous messages is not available for {} yet.",
+                        self.agent_name
+                    ))
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+                ),
+            )
+        })
+    }
+}
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -19,7 +19,7 @@ use std::sync::Arc;

 use client::{Client, UserStore, zed_urls};
 use gpui::{AnyElement, Entity, IntoElement, ParentElement};
-use ui::{Divider, RegisterComponent, TintColor, Tooltip, prelude::*};
+use ui::{Divider, RegisterComponent, Tooltip, prelude::*};

 #[derive(PartialEq)]
 pub enum SignInStatus {
@@ -43,12 +43,10 @@ impl From<client::Status> for SignInStatus {
 #[derive(RegisterComponent, IntoElement)]
 pub struct ZedAiOnboarding {
    pub sign_in_status: SignInStatus,
-    pub has_accepted_terms_of_service: bool,
    pub plan: Option<Plan>,
    pub account_too_young: bool,
    pub continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    pub accept_terms_of_service: Arc<dyn Fn(&mut Window, &mut App)>,
    pub dismiss_onboarding: Option<Arc<dyn Fn(&mut Window, &mut App)>>,
 }

@@ -64,17 +62,9 @@ impl ZedAiOnboarding {

        Self {
            sign_in_status: status.into(),
-            has_accepted_terms_of_service: store.has_accepted_terms_of_service(),
            plan: store.plan(),
            account_too_young: store.account_too_young(),
            continue_with_zed_ai,
-            accept_terms_of_service: Arc::new({
-                let store = user_store.clone();
-                move |_window, cx| {
-                    let task = store.update(cx, |store, cx| store.accept_terms_of_service(cx));
-                    task.detach_and_log_err(cx);
-                }
-            }),
            sign_in: Arc::new(move |_window, cx| {
                cx.spawn({
                    let client = client.clone();
@@ -94,42 +84,6 @@ impl ZedAiOnboarding {
        self
    }

-    fn render_accept_terms_of_service(&self) -> AnyElement {
-        v_flex()
-            .gap_1()
-            .w_full()
-            .child(Headline::new("Accept Terms of Service"))
-            .child(
-                Label::new("We don’t sell your data, track you across the web, or compromise your privacy.")
-                    .color(Color::Muted)
-                    .mb_2(),
-            )
-            .child(
-                Button::new("terms_of_service", "Review Terms of Service")
-                    .full_width()
-                    .style(ButtonStyle::Outlined)
-                    .icon(IconName::ArrowUpRight)
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small)
-                    .on_click(move |_, _window, cx| {
-                        telemetry::event!("Review Terms of Service Clicked");
-                        cx.open_url(&zed_urls::terms_of_service(cx))
-                    }),
-            )
-            .child(
-                Button::new("accept_terms", "Accept")
-                    .full_width()
-                    .style(ButtonStyle::Tinted(TintColor::Accent))
-                    .on_click({
-                        let callback = self.accept_terms_of_service.clone();
-                        move |_, window, cx| {
-                            telemetry::event!("Terms of Service Accepted");
-                            (callback)(window, cx)}
-                    }),
-            )
-            .into_any_element()
-    }
-
    fn render_sign_in_disclaimer(&self, _cx: &mut App) -> AnyElement {
        let signing_in = matches!(self.sign_in_status, SignInStatus::SigningIn);
        let plan_definitions = PlanDefinitions;
@@ -359,14 +313,10 @@ impl ZedAiOnboarding {
 impl RenderOnce for ZedAiOnboarding {
    fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
        if matches!(self.sign_in_status, SignInStatus::SignedIn) {
-            if self.has_accepted_terms_of_service {
-                match self.plan {
-                    None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
-                    Some(Plan::ZedProTrial) => self.render_trial_state(cx),
-                    Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
-                }
-            } else {
-                self.render_accept_terms_of_service()
+            match self.plan {
+                None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
+                Some(Plan::ZedProTrial) => self.render_trial_state(cx),
+                Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
            }
        } else {
            self.render_sign_in_disclaimer(cx)
@@ -390,18 +340,15 @@ impl Component for ZedAiOnboarding {
    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
        fn onboarding(
            sign_in_status: SignInStatus,
-            has_accepted_terms_of_service: bool,
            plan: Option<Plan>,
            account_too_young: bool,
        ) -> AnyElement {
            ZedAiOnboarding {
                sign_in_status,
-                has_accepted_terms_of_service,
                plan,
                account_too_young,
                continue_with_zed_ai: Arc::new(|_, _| {}),
                sign_in: Arc::new(|_, _| {}),
-                accept_terms_of_service: Arc::new(|_, _| {}),
                dismiss_onboarding: None,
            }
            .into_any_element()
@@ -415,27 +362,23 @@ impl Component for ZedAiOnboarding {
                .children(vec![
                    single_example(
                        "Not Signed-in",
-                        onboarding(SignInStatus::SignedOut, false, None, false),
-                    ),
-                    single_example(
-                        "Not Accepted ToS",
-                        onboarding(SignInStatus::SignedIn, false, None, false),
+                        onboarding(SignInStatus::SignedOut, None, false),
                    ),
                    single_example(
                        "Young Account",
-                        onboarding(SignInStatus::SignedIn, true, None, true),
+                        onboarding(SignInStatus::SignedIn, None, true),
                    ),
                    single_example(
                        "Free Plan",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedFree), false),
+                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedFree), false),
                    ),
                    single_example(
                        "Pro Trial",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedProTrial), false),
+                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedProTrial), false),
                    ),
                    single_example(
                        "Pro Plan",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedPro), false),
+                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedPro), false),
                    ),
                ])
                .into_any_element(),
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -12,11 +12,11 @@ use crate::{SignInStatus, YoungAccountBanner, plan_definitions::PlanDefinitions}

 #[derive(IntoElement, RegisterComponent)]
 pub struct AiUpsellCard {
-    pub sign_in_status: SignInStatus,
-    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    pub account_too_young: bool,
-    pub user_plan: Option<Plan>,
-    pub tab_index: Option<isize>,
+    sign_in_status: SignInStatus,
+    sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
+    account_too_young: bool,
+    user_plan: Option<Plan>,
+    tab_index: Option<isize>,
 }

 impl AiUpsellCard {
@@ -43,6 +43,11 @@ impl AiUpsellCard {
            tab_index: None,
        }
    }
+
+    pub fn tab_index(mut self, tab_index: Option<isize>) -> Self {
+        self.tab_index = tab_index;
+        self
+    }
 }

 impl RenderOnce for AiUpsellCard {
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -118,7 +118,7 @@ impl Tool for FetchTool {
    }

    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
-        false
+        true
    }

    fn may_perform_edits(&self) -> bool {
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -435,8 +435,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("root/apple/banana/carrot")),
+                PathBuf::from(path!("root/apple/bandana/carbonara"))
            ]
        );

@@ -447,8 +447,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("root/apple/banana/carrot")),
+                PathBuf::from(path!("root/apple/bandana/carbonara"))
            ]
        );
    }
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -68,7 +68,7 @@ impl Tool for ReadFileTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolRead
+        IconName::ToolSearch
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -15,9 +15,10 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 collections.workspace = true
-derive_more.workspace = true
 gpui.workspace = true
-parking_lot.workspace = true
+settings.workspace = true
+schemars.workspace = true
+serde.workspace = true
 rodio = { workspace = true, features = [ "wav", "playback", "tracing" ] }
 util.workspace = true
 workspace-hack.workspace = true
--- a/crates/audio/src/assets.rs
+++ b/crates/audio/src/assets.rs
@@ -1,54 +0,0 @@
-use std::{io::Cursor, sync::Arc};
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use gpui::{App, AssetSource, Global};
-use rodio::{Decoder, Source, source::Buffered};
-
-type Sound = Buffered<Decoder<Cursor<Vec<u8>>>>;
-
-pub struct SoundRegistry {
-    cache: Arc<parking_lot::Mutex<HashMap<String, Sound>>>,
-    assets: Box<dyn AssetSource>,
-}
-
-struct GlobalSoundRegistry(Arc<SoundRegistry>);
-
-impl Global for GlobalSoundRegistry {}
-
-impl SoundRegistry {
-    pub fn new(source: impl AssetSource) -> Arc<Self> {
-        Arc::new(Self {
-            cache: Default::default(),
-            assets: Box::new(source),
-        })
-    }
-
-    pub fn global(cx: &App) -> Arc<Self> {
-        cx.global::<GlobalSoundRegistry>().0.clone()
-    }
-
-    pub(crate) fn set_global(source: impl AssetSource, cx: &mut App) {
-        cx.set_global(GlobalSoundRegistry(SoundRegistry::new(source)));
-    }
-
-    pub fn get(&self, name: &str) -> Result<impl Source<Item = f32> + use<>> {
-        if let Some(wav) = self.cache.lock().get(name) {
-            return Ok(wav.clone());
-        }
-
-        let path = format!("sounds/{}.wav", name);
-        let bytes = self
-            .assets
-            .load(&path)?
-            .map(anyhow::Ok)
-            .with_context(|| format!("No asset available for path {path}"))??
-            .into_owned();
-        let cursor = Cursor::new(bytes);
-        let source = Decoder::new(cursor)?.buffered();
-
-        self.cache.lock().insert(name.to_string(), source.clone());
-
-        Ok(source)
-    }
-}
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,16 +1,19 @@
-use assets::SoundRegistry;
-use derive_more::{Deref, DerefMut};
-use gpui::{App, AssetSource, BorrowAppContext, Global};
-use rodio::{OutputStream, OutputStreamBuilder};
+use anyhow::{Context as _, Result, anyhow};
+use collections::HashMap;
+use gpui::{App, BorrowAppContext, Global};
+use rodio::{Decoder, OutputStream, OutputStreamBuilder, Source, source::Buffered};
+use settings::Settings;
+use std::io::Cursor;
 use util::ResultExt;

-mod assets;
+mod audio_settings;
+pub use audio_settings::AudioSettings;

-pub fn init(source: impl AssetSource, cx: &mut App) {
-    SoundRegistry::set_global(source, cx);
-    cx.set_global(GlobalAudio(Audio::new()));
+pub fn init(cx: &mut App) {
+    AudioSettings::register(cx);
 }

+#[derive(Copy, Clone, Eq, Hash, PartialEq)]
 pub enum Sound {
    Joined,
    Leave,
@@ -38,18 +41,12 @@ impl Sound {
 #[derive(Default)]
 pub struct Audio {
    output_handle: Option<OutputStream>,
+    source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
 }

-#[derive(Deref, DerefMut)]
-struct GlobalAudio(Audio);
-
-impl Global for GlobalAudio {}
+impl Global for Audio {}

 impl Audio {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
    fn ensure_output_exists(&mut self) -> Option<&OutputStream> {
        if self.output_handle.is_none() {
            self.output_handle = OutputStreamBuilder::open_default_stream().log_err();
@@ -58,26 +55,51 @@ impl Audio {
        self.output_handle.as_ref()
    }

-    pub fn play_sound(sound: Sound, cx: &mut App) {
-        if !cx.has_global::<GlobalAudio>() {
-            return;
-        }
+    pub fn play_source(
+        source: impl rodio::Source + Send + 'static,
+        cx: &mut App,
+    ) -> anyhow::Result<()> {
+        cx.update_default_global(|this: &mut Self, _cx| {
+            let output_handle = this
+                .ensure_output_exists()
+                .ok_or_else(|| anyhow!("Could not open audio output"))?;
+            output_handle.mixer().add(source);
+            Ok(())
+        })
+    }

-        cx.update_global::<GlobalAudio, _>(|this, cx| {
+    pub fn play_sound(sound: Sound, cx: &mut App) {
+        cx.update_default_global(|this: &mut Self, cx| {
+            let source = this.sound_source(sound, cx).log_err()?;
            let output_handle = this.ensure_output_exists()?;
-            let source = SoundRegistry::global(cx).get(sound.file()).log_err()?;
            output_handle.mixer().add(source);
            Some(())
        });
    }

    pub fn end_call(cx: &mut App) {
-        if !cx.has_global::<GlobalAudio>() {
-            return;
-        }
-
-        cx.update_global::<GlobalAudio, _>(|this, _| {
+        cx.update_default_global(|this: &mut Self, _cx| {
            this.output_handle.take();
        });
    }
+
+    fn sound_source(&mut self, sound: Sound, cx: &App) -> Result<impl Source + use<>> {
+        if let Some(wav) = self.source_cache.get(&sound) {
+            return Ok(wav.clone());
+        }
+
+        let path = format!("sounds/{}.wav", sound.file());
+        let bytes = cx
+            .asset_source()
+            .load(&path)?
+            .map(anyhow::Ok)
+            .with_context(|| format!("No asset available for path {path}"))??
+            .into_owned();
+        let cursor = Cursor::new(bytes);
+        let source = Decoder::new(cursor)?.buffered();
+
+        self.source_cache.insert(sound, source.clone());
+
+        Ok(source)
+    }
 }
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -0,0 +1,33 @@
+use anyhow::Result;
+use gpui::App;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings, SettingsSources};
+
+#[derive(Deserialize, Debug)]
+pub struct AudioSettings {
+    /// Opt into the new audio system.
+    #[serde(rename = "experimental.rodio_audio", default)]
+    pub rodio_audio: bool, // default is false
+}
+
+/// Configuration of audio in Zed.
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[serde(default)]
+pub struct AudioSettingsContent {
+    /// Whether to use the experimental audio system
+    #[serde(rename = "experimental.rodio_audio", default)]
+    pub rodio_audio: bool,
+}
+
+impl Settings for AudioSettings {
+    const KEY: Option<&'static str> = Some("audio");
+
+    type FileContent = AudioSettingsContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
+        sources.json_merge()
+    }
+
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
+}
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -162,6 +162,22 @@ impl BufferDiffSnapshot {
        }
    }

+    fn unchanged(
+        buffer: &text::BufferSnapshot,
+        base_text: language::BufferSnapshot,
+    ) -> BufferDiffSnapshot {
+        debug_assert_eq!(buffer.text(), base_text.text());
+        BufferDiffSnapshot {
+            inner: BufferDiffInner {
+                base_text,
+                hunks: SumTree::new(buffer),
+                pending_hunks: SumTree::new(buffer),
+                base_text_exists: false,
+            },
+            secondary_diff: None,
+        }
+    }
+
    fn new_with_base_text(
        buffer: text::BufferSnapshot,
        base_text: Option<Arc<String>>,
@@ -213,7 +229,10 @@ impl BufferDiffSnapshot {
        cx: &App,
    ) -> impl Future<Output = Self> + use<> {
        let base_text_exists = base_text.is_some();
-        let base_text_pair = base_text.map(|text| (text, base_text_snapshot.as_rope().clone()));
+        let base_text_pair = base_text.map(|text| {
+            debug_assert_eq!(&*text, &base_text_snapshot.text());
+            (text, base_text_snapshot.as_rope().clone())
+        });
        cx.background_executor()
            .spawn_labeled(*CALCULATE_DIFF_TASK, async move {
                Self {
@@ -873,6 +892,18 @@ impl BufferDiff {
        }
    }

+    pub fn new_unchanged(
+        buffer: &text::BufferSnapshot,
+        base_text: language::BufferSnapshot,
+    ) -> Self {
+        debug_assert_eq!(buffer.text(), base_text.text());
+        BufferDiff {
+            buffer_id: buffer.remote_id(),
+            inner: BufferDiffSnapshot::unchanged(buffer, base_text).inner,
+            secondary_diff: None,
+        }
+    }
+
    #[cfg(any(test, feature = "test-support"))]
    pub fn new_with_base_text(
        base_text: &str,
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -66,6 +66,8 @@ pub static IMPERSONATE_LOGIN: LazyLock<Option<String>> = LazyLock::new(|| {
        .and_then(|s| if s.is_empty() { None } else { Some(s) })
 });

+pub static USE_WEB_LOGIN: LazyLock<bool> = LazyLock::new(|| std::env::var("ZED_WEB_LOGIN").is_ok());
+
 pub static ADMIN_API_TOKEN: LazyLock<Option<String>> = LazyLock::new(|| {
    std::env::var("ZED_ADMIN_API_TOKEN")
        .ok()
@@ -1290,19 +1292,21 @@ impl Client {
                "http" => Http,
                _ => Err(anyhow!("invalid rpc url: {}", rpc_url))?,
            };
-            let rpc_host = rpc_url
-                .host_str()
-                .zip(rpc_url.port_or_known_default())
-                .context("missing host in rpc url")?;

-            let stream = {
-                let handle = cx.update(|cx| gpui_tokio::Tokio::handle(cx)).ok().unwrap();
-                let _guard = handle.enter();
-                match proxy {
-                    Some(proxy) => connect_proxy_stream(&proxy, rpc_host).await?,
-                    None => Box::new(TcpStream::connect(rpc_host).await?),
+            let stream = gpui_tokio::Tokio::spawn_result(cx, {
+                let rpc_url = rpc_url.clone();
+                async move {
+                    let rpc_host = rpc_url
+                        .host_str()
+                        .zip(rpc_url.port_or_known_default())
+                        .context("missing host in rpc url")?;
+                    Ok(match proxy {
+                        Some(proxy) => connect_proxy_stream(&proxy, rpc_host).await?,
+                        None => Box::new(TcpStream::connect(rpc_host).await?),
+                    })
                }
-            };
+            })?
+            .await?;

            log::info!("connected to rpc endpoint {}", rpc_url);

@@ -1390,11 +1394,13 @@ impl Client {
                    if let Some((login, token)) =
                        IMPERSONATE_LOGIN.as_ref().zip(ADMIN_API_TOKEN.as_ref())
                    {
-                        eprintln!("authenticate as admin {login}, {token}");
+                        if !*USE_WEB_LOGIN {
+                            eprintln!("authenticate as admin {login}, {token}");

-                        return this
-                            .authenticate_as_admin(http, login.clone(), token.clone())
-                            .await;
+                            return this
+                                .authenticate_as_admin(http, login.clone(), token.clone())
+                                .await;
+                        }
                    }

                    // Start an HTTP server to receive the redirect from Zed's sign-in page.
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -76,7 +76,7 @@ static ZED_CLIENT_CHECKSUM_SEED: LazyLock<Option<Vec<u8>>> = LazyLock::new(|| {

 pub static MINIDUMP_ENDPOINT: LazyLock<Option<String>> = LazyLock::new(|| {
    option_env!("ZED_MINIDUMP_ENDPOINT")
-        .map(|s| s.to_owned())
+        .map(str::to_string)
        .or_else(|| env::var("ZED_MINIDUMP_ENDPOINT").ok())
 });

--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -1,5 +1,5 @@
 use super::{Client, Status, TypedEnvelope, proto};
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context as _, Result};
 use chrono::{DateTime, Utc};
 use cloud_api_client::websocket_protocol::MessageToClient;
 use cloud_api_client::{GetAuthenticatedUserResponse, PlanInfo};
@@ -46,11 +46,6 @@ impl ProjectId {
    }
 }

-#[derive(
-    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
-)]
-pub struct DevServerProjectId(pub u64);
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ParticipantIndex(pub u32);

@@ -116,7 +111,6 @@ pub struct UserStore {
    edit_prediction_usage: Option<EditPredictionUsage>,
    plan_info: Option<PlanInfo>,
    current_user: watch::Receiver<Option<Arc<User>>>,
-    accepted_tos_at: Option<Option<cloud_api_client::Timestamp>>,
    contacts: Vec<Arc<Contact>>,
    incoming_contact_requests: Vec<Arc<User>>,
    outgoing_contact_requests: Vec<Arc<User>>,
@@ -194,7 +188,6 @@ impl UserStore {
            plan_info: None,
            model_request_usage: None,
            edit_prediction_usage: None,
-            accepted_tos_at: None,
            contacts: Default::default(),
            incoming_contact_requests: Default::default(),
            participant_indices: Default::default(),
@@ -271,7 +264,6 @@ impl UserStore {
                        Status::SignedOut => {
                            current_user_tx.send(None).await.ok();
                            this.update(cx, |this, cx| {
-                                this.accepted_tos_at = None;
                                cx.emit(Event::PrivateUserInfoUpdated);
                                cx.notify();
                                this.clear_contacts()
@@ -791,19 +783,6 @@ impl UserStore {
                .set_authenticated_user_info(Some(response.user.metrics_id.clone()), staff);
        }

-        let accepted_tos_at = {
-            #[cfg(debug_assertions)]
-            if std::env::var("ZED_IGNORE_ACCEPTED_TOS").is_ok() {
-                None
-            } else {
-                response.user.accepted_tos_at
-            }
-
-            #[cfg(not(debug_assertions))]
-            response.user.accepted_tos_at
-        };
-
-        self.accepted_tos_at = Some(accepted_tos_at);
        self.model_request_usage = Some(ModelRequestUsage(RequestUsage {
            limit: response.plan.usage.model_requests.limit,
            amount: response.plan.usage.model_requests.used as i32,
@@ -846,32 +825,6 @@ impl UserStore {
        self.current_user.clone()
    }

-    pub fn has_accepted_terms_of_service(&self) -> bool {
-        self.accepted_tos_at
-            .is_some_and(|accepted_tos_at| accepted_tos_at.is_some())
-    }
-
-    pub fn accept_terms_of_service(&self, cx: &Context<Self>) -> Task<Result<()>> {
-        if self.current_user().is_none() {
-            return Task::ready(Err(anyhow!("no current user")));
-        };
-
-        let client = self.client.clone();
-        cx.spawn(async move |this, cx| -> anyhow::Result<()> {
-            let client = client.upgrade().context("client not found")?;
-            let response = client
-                .cloud_client()
-                .accept_terms_of_service()
-                .await
-                .context("error accepting tos")?;
-            this.update(cx, |this, cx| {
-                this.accepted_tos_at = Some(response.user.accepted_tos_at);
-                cx.emit(Event::PrivateUserInfoUpdated);
-            })?;
-            Ok(())
-        })
-    }
-
    fn load_users(
        &self,
        request: impl RequestMessage<Response = UsersResponse>,
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -102,13 +102,7 @@ impl CloudApiClient {
        let credentials = credentials.as_ref().context("no credentials provided")?;
        let authorization_header = format!("{} {}", credentials.user_id, credentials.access_token);

-        Ok(cx.spawn(async move |cx| {
-            let handle = cx
-                .update(|cx| Tokio::handle(cx))
-                .ok()
-                .context("failed to get Tokio handle")?;
-            let _guard = handle.enter();
-
+        Ok(Tokio::spawn_result(cx, async move {
            let ws = WebSocket::connect(connect_url)
                .with_request(
                    request::Builder::new()
@@ -121,34 +115,6 @@ impl CloudApiClient {
        }))
    }

-    pub async fn accept_terms_of_service(&self) -> Result<AcceptTermsOfServiceResponse> {
-        let request = self.build_request(
-            Request::builder().method(Method::POST).uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/terms_of_service/accept", &[])?
-                    .as_ref(),
-            ),
-            AsyncBody::default(),
-        )?;
-
-        let mut response = self.http_client.send(request).await?;
-
-        if !response.status().is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-
-            anyhow::bail!(
-                "Failed to accept terms of service.\nStatus: {:?}\nBody: {body}",
-                response.status()
-            )
-        }
-
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        Ok(serde_json::from_str(&body)?)
-    }
-
    pub async fn create_llm_token(
        &self,
        system_id: Option<String>,
--- a/Show More
+++ b/Show More