Fix after new settings

Co-Authored-By: dino <dinojoaocosta@gmail.com>
Merge branch 'main' into vim-set-ic
2025-09-29 16:15:45 -06:00 · 2025-09-29 15:58:35 -06:00 · 2025-09-03 15:12:08 +01:00
634 changed files with 16194 additions and 134046 deletions
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -24,7 +24,7 @@ workspace-members = [
 third-party = [
    { name = "reqwest", version = "0.11.27" },
    # build of remote_server should not include scap / its x11 dependency
-    { name = "zed-scap", git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", version = "0.0.8-zed" },
+    { name = "scap", git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7" },
    # build of remote_server should not need to include on libalsa through rodio
    { name = "rodio", git = "https://github.com/RustAudio/rodio" },
 ]
@@ -37,6 +37,8 @@ workspace-members = [
    "zed_glsl",
    "zed_html",
    "zed_proto",
+    "zed_ruff",
    "slash_commands_example",
+    "zed_snippets",
    "zed_test_extension",
 ]
--- a/.github/ISSUE_TEMPLATE/07_bug_windows.yml
+++ b/.github/ISSUE_TEMPLATE/07_bug_windows.yml
@@ -1,35 +0,0 @@
-name: Bug Report (Windows)
-description: Zed Windows Related Bugs
-type: "Bug"
-labels: ["windows"]
-title: "Windows: <a short description of the Windows bug>"
-body:
-  - type: textarea
-    attributes:
-      label: Summary
-      description: Describe the bug with a one-line summary, and provide detailed reproduction steps
-      value: |
-        <!-- Please insert a one-line summary of the issue below -->
-        SUMMARY_SENTENCE_HERE
-
-        ### Description
-        <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
-        Steps to trigger the problem:
-        1.
-        2.
-        3.
-
-        **Expected Behavior**:
-        **Actual Behavior**:
-
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Zed Version and System Specs
-      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
-      placeholder: |
-        Output of "zed: copy system specs into clipboard"
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/07_bug_windows_beta.yml
+++ b/.github/ISSUE_TEMPLATE/07_bug_windows_beta.yml
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -20,4 +20,4 @@ runs:

    - name: Run tests
      shell: bash -euxo pipefail {0}
-      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
+      run: cargo nextest run --workspace --no-fail-fast
--- a/.github/actions/run_tests_windows/action.yml
+++ b/.github/actions/run_tests_windows/action.yml
@@ -24,4 +24,4 @@ runs:
      shell: powershell
      working-directory: ${{ inputs.working-directory }}
      run: |
-        cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
+        cargo nextest run --workspace --no-fail-fast
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -826,9 +826,8 @@ jobs:
    timeout-minutes: 120
    name: Create a Windows installer
    runs-on: [self-32vcpu-windows-2022]
-    if: |
-      ( startsWith(github.ref, 'refs/tags/v')
-      || contains(github.event.pull_request.labels.*.name, 'run-bundling') )
+    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]
    env:
      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
@@ -866,12 +865,13 @@ jobs:
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
        with:
-          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.exe
+          name: ZedEditorUserSetup-x64-${{ github.event.pull_request.head.sha || github.sha }}.exe
          path: ${{ env.SETUP_PATH }}

      - name: Upload Artifacts to release
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
-        if: ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) }}
+        # Re-enable when we are ready to publish windows preview releases
+        if: ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) && env.RELEASE_CHANNEL == 'preview' }} # upload only preview
        with:
          draft: true
          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
--- a/.github/workflows/community_release_actions.yml
+++ b/.github/workflows/community_release_actions.yml
@@ -39,7 +39,7 @@ jobs:
          content: ${{ steps.get-content.outputs.string }}

  send_release_notes_email:
-    if: false && github.repository_owner == 'zed-industries' && !github.event.release.prerelease
+    if: github.repository_owner == 'zed-industries' && !github.event.release.prerelease
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
--- a/.github/workflows/issue_response.yml
+++ b/.github/workflows/issue_response.yml
@@ -0,0 +1,33 @@
+name: Issue Response
+
+on:
+  schedule:
+    - cron: "0 12 * * 2"
+  workflow_dispatch:
+
+jobs:
+  issue-response:
+    if: github.repository_owner == 'zed-industries'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+        with:
+          version: 9
+
+      - name: Setup Node
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: "20"
+          cache: "pnpm"
+          cache-dependency-path: "script/issue_response/pnpm-lock.yaml"
+
+      - run: pnpm install --dir script/issue_response
+
+      - name: Run Issue Response
+        run: pnpm run --dir script/issue_response start
+        env:
+          ISSUE_RESPONSE_GITHUB_TOKEN: ${{ secrets.ISSUE_RESPONSE_GITHUB_TOKEN }}
+          SLACK_ISSUE_RESPONSE_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_RESPONSE_WEBHOOK_URL }}
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -164,7 +164,6 @@ members = [
    "crates/sum_tree",
    "crates/supermaven",
    "crates/supermaven_api",
-    "crates/codestral",
    "crates/svg_preview",
    "crates/system_specs",
    "crates/tab_switcher",
@@ -213,7 +212,9 @@ members = [
    "extensions/glsl",
    "extensions/html",
    "extensions/proto",
+    "extensions/ruff",
    "extensions/slash-commands-example",
+    "extensions/snippets",
    "extensions/test-extension",

    #
@@ -274,7 +275,7 @@ cloud_llm_client = { path = "crates/cloud_llm_client" }
 cloud_zeta2_prompt = { path = "crates/cloud_zeta2_prompt" }
 collab = { path = "crates/collab" }
 collab_ui = { path = "crates/collab_ui" }
-collections = { path = "crates/collections", package = "zed-collections", version = "0.1.0" }
+collections = { path = "crates/collections" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 component = { path = "crates/component" }
@@ -290,7 +291,6 @@ debug_adapter_extension = { path = "crates/debug_adapter_extension" }
 debugger_tools = { path = "crates/debugger_tools" }
 debugger_ui = { path = "crates/debugger_ui" }
 deepseek = { path = "crates/deepseek" }
-derive_refineable = { path = "crates/refineable/derive_refineable", package = "zed-derive-refineable", version = "0.1.0" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
@@ -309,10 +309,10 @@ git_ui = { path = "crates/git_ui" }
 go_to_line = { path = "crates/go_to_line" }
 google_ai = { path = "crates/google_ai" }
 gpui = { path = "crates/gpui", default-features = false }
-gpui_macros = { path = "crates/gpui_macros", package = "gpui-macros", version = "0.1.0" }
+gpui_macros = { path = "crates/gpui_macros" }
 gpui_tokio = { path = "crates/gpui_tokio" }
 html_to_markdown = { path = "crates/html_to_markdown" }
-http_client = { path = "crates/http_client", package = "zed-http-client", version = "0.1.0" }
+http_client = { path = "crates/http_client" }
 http_client_tls = { path = "crates/http_client_tls" }
 icons = { path = "crates/icons" }
 image_viewer = { path = "crates/image_viewer" }
@@ -341,7 +341,7 @@ lsp = { path = "crates/lsp" }
 markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
 svg_preview = { path = "crates/svg_preview" }
-media = { path = "crates/media", package = "zed-media", version = "0.1.0" }
+media = { path = "crates/media" }
 menu = { path = "crates/menu" }
 migrator = { path = "crates/migrator" }
 mistral = { path = "crates/mistral" }
@@ -358,7 +358,7 @@ outline = { path = "crates/outline" }
 outline_panel = { path = "crates/outline_panel" }
 panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
-perf = { path = "tooling/perf", package = "zed-perf", version = "0.1.0" }
+perf = { path = "tooling/perf" }
 picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
@@ -370,7 +370,7 @@ project_symbols = { path = "crates/project_symbols" }
 prompt_store = { path = "crates/prompt_store" }
 proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
-refineable = { path = "crates/refineable", package = "zed-refineable", version = "0.1.0" }
+refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
 scheduler = { path = "crates/scheduler" }
 remote = { path = "crates/remote" }
@@ -383,7 +383,7 @@ rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
 search = { path = "crates/search" }
-semantic_version = { path = "crates/semantic_version", package = "zed-semantic-version", version = "0.1.0" }
+semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
 settings_macros = { path = "crates/settings_macros" }
@@ -396,10 +396,9 @@ sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
 storybook = { path = "crates/storybook" }
 streaming_diff = { path = "crates/streaming_diff" }
-sum_tree = { path = "crates/sum_tree", package = "zed-sum-tree", version = "0.1.0" }
+sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
-codestral = { path = "crates/codestral" }
 system_specs = { path = "crates/system_specs" }
 tab_switcher = { path = "crates/tab_switcher" }
 task = { path = "crates/task" }
@@ -420,8 +419,8 @@ ui = { path = "crates/ui" }
 ui_input = { path = "crates/ui_input" }
 ui_macros = { path = "crates/ui_macros" }
 ui_prompt = { path = "crates/ui_prompt" }
-util = { path = "crates/util", package = "zed-util", version = "0.1.0" }
-util_macros = { path = "crates/util_macros", package = "zed-util-macros", version = "0.1.0" }
+util = { path = "crates/util" }
+util_macros = { path = "crates/util_macros" }
 vercel = { path = "crates/vercel" }
 vim = { path = "crates/vim" }
 vim_mode_setting = { path = "crates/vim_mode_setting" }
@@ -475,9 +474,10 @@ backtrace = "0.3"
 base64 = "0.22"
 bincode = "1.2.1"
 bitflags = "2.6.0"
-blade-graphics = { version = "0.7.0" }
-blade-macros = { version = "0.3.0" }
-blade-util = { version = "0.3.0" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
+blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
 cargo_toml = "0.21"
@@ -550,7 +550,6 @@ nanoid = "0.4"
 nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 nix = "0.29"
 num-format = "0.4.4"
-num-traits = "0.2"
 objc = "0.2"
 objc2-foundation = { version = "0.3", default-features = false, features = [
    "NSArray",
@@ -607,8 +606,7 @@ rand = "0.9"
 rayon = "1.8"
 ref-cast = "1.0.24"
 regex = "1.5"
-# WARNING: If you change this, you must also publish a new version of zed-reqwest to crates.io
-reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = [
+reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c770a32f1998d6e999cef3e59e0013e6c4415", default-features = false, features = [
    "charset",
    "http2",
    "macos-system-configuration",
@@ -616,17 +614,17 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662
    "rustls-tls-native-roots",
    "socks",
    "stream",
-], package = "zed-reqwest", version = "0.12.15-zed" }
+] }
 rsa = "0.9.6"
 runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
 rust-embed = { version = "8.4", features = ["include-exclude"] }
+rustc-demangle = "0.1.23"
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.26" }
 rustls-platform-verifier = "0.5.0"
-# WARNING: If you change this, you must also publish a new version of zed-scap to crates.io
-scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", default-features = false, package = "zed-scap", version = "0.0.8-zed" }
+scap = { git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7", default-features = false }
 schemars = { version = "1.0", features = ["indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0.221", features = ["derive", "rc"] }
@@ -652,9 +650,9 @@ streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.27.0", features = ["derive"] }
 subtle = "2.5.0"
-syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }
+syn = { version = "2.0.101", features = ["full", "extra-traits"] }
 sys-locale = "0.3.1"
-sysinfo = "0.37.0"
+sysinfo = "0.31.0"
 take-until = "0.2.0"
 tempfile = "3.20.0"
 thiserror = "2.0.12"
@@ -670,7 +668,6 @@ tiny_http = "0.8"
 tokio = { version = "1" }
 tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
 toml = "0.8"
-toml_edit = { version = "0.22", default-features = false, features = ["display", "parse", "serde"] }
 tower-http = "0.4.4"
 tree-sitter = { version = "0.25.10", features = ["wasm"] }
 tree-sitter-bash = "0.25.0"
@@ -693,7 +690,7 @@ tree-sitter-python = "0.25"
 tree-sitter-regex = "0.24"
 tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.24"
-tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-typescript", rev = "e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899" } # https://github.com/tree-sitter/tree-sitter-typescript/pull/347
+tree-sitter-typescript = "0.23"
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 unicase = "2.6"
 unicode-script = "0.5.7"
@@ -717,6 +714,7 @@ wasmtime = { version = "29", default-features = false, features = [
 wasmtime-wasi = "29"
 which = "6.0.0"
 windows-core = "0.61"
+windows-sys = "0.61"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
 yawc = "0.2.5"
@@ -805,7 +803,7 @@ wasmtime = { opt-level = 3 }
 activity_indicator = { codegen-units = 1 }
 assets = { codegen-units = 1 }
 breadcrumbs = { codegen-units = 1 }
-zed-collections = { codegen-units = 1 }
+collections = { codegen-units = 1 }
 command_palette = { codegen-units = 1 }
 command_palette_hooks = { codegen-units = 1 }
 extension_cli = { codegen-units = 1 }
@@ -825,11 +823,11 @@ outline = { codegen-units = 1 }
 paths = { codegen-units = 1 }
 prettier = { codegen-units = 1 }
 project_symbols = { codegen-units = 1 }
-zed-refineable = { codegen-units = 1 }
+refineable = { codegen-units = 1 }
 release_channel = { codegen-units = 1 }
 reqwest_client = { codegen-units = 1 }
 rich_text = { codegen-units = 1 }
-zed-semantic-version = { codegen-units = 1 }
+semantic_version = { codegen-units = 1 }
 session = { codegen-units = 1 }
 snippet = { codegen-units = 1 }
 snippets_ui = { codegen-units = 1 }
--- a/Cross.toml
+++ b/Cross.toml
@@ -0,0 +1,2 @@
+[build]
+dockerfile = "Dockerfile-cross"
--- a/17
+++ b/17
@@ -0,0 +1,17 @@
+# syntax=docker/dockerfile:1
+
+ARG CROSS_BASE_IMAGE
+FROM ${CROSS_BASE_IMAGE}
+WORKDIR /app
+ARG TZ=Etc/UTC \
+    LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    DEBIAN_FRONTEND=noninteractive
+ENV CARGO_TERM_COLOR=always
+
+COPY script/install-mold script/
+RUN ./script/install-mold "2.34.0"
+COPY script/remote-server script/
+RUN ./script/remote-server
+
+COPY . .
--- a/GEMINI.md
+++ b/GEMINI.md
@@ -1 +0,0 @@
-.rules
--- a/assets/icons/editor_cursor.svg
+++ b/assets/icons/editor_cursor.svg
@@ -1,3 +1,9 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.2806 4.66818L8.26042 1.76982C8.09921 1.67673 7.9003 1.67673 7.73909 1.76982L2.71918 4.66818C2.58367 4.74642 2.5 4.89112 2.5 5.04785V10.8924C2.5 11.0489 2.58367 11.1938 2.71918 11.2721L7.73934 14.1704C7.90054 14.2635 8.09946 14.2635 8.26066 14.1704L13.2808 11.2721C13.4163 11.1938 13.5 11.0491 13.5 10.8924V5.04785C13.5 4.89136 13.4163 4.74642 13.2808 4.66818H13.2806ZM12.9653 5.28212L8.11901 13.676C8.08626 13.7326 7.99977 13.7095 7.99977 13.6439V8.14771C7.99977 8.03788 7.94107 7.9363 7.84586 7.88115L3.08613 5.13317C3.02957 5.10041 3.05266 5.0139 3.11818 5.0139H12.8106C12.9483 5.0139 13.0343 5.1631 12.9655 5.28236H12.9653V5.28212Z" fill="#C4CAD4"/>
+<path opacity="0.6" d="M3.5 11V5.5L8.5 8L3.5 11Z" fill="black"/>
+<path opacity="0.4" d="M8.5 14L3.5 11L8.5 8V14Z" fill="black"/>
+<path opacity="0.6" d="M8.5 5.5H3.5L8.5 2.5L8.5 5.5Z" fill="black"/>
+<path opacity="0.8" d="M8.5 5.5V2.5L13.5 5.5H8.5Z" fill="black"/>
+<path opacity="0.2" d="M13.5 11L8.5 14L11 9.5L13.5 11Z" fill="black"/>
+<path opacity="0.5" d="M13.5 11L11 9.5L13.5 5V11Z" fill="black"/>
+<path d="M3.5 11V5L8.5 2.11325L13.5 5V11L8.5 13.8868L3.5 11Z" stroke="black"/>
 </svg>
--- a/assets/icons/paperclip.svg
+++ b/assets/icons/paperclip.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.1645 4.45825L5.20344 9.52074C4.98225 9.74193 4.85798 10.0419 4.85798 10.3548C4.85798 10.6676 4.98225 10.9676 5.20344 11.1888C5.42464 11.41 5.72464 11.5342 6.03746 11.5342C6.35028 11.5342 6.65028 11.41 6.87148 11.1888L11.8326 6.12629C12.2749 5.68397 12.5234 5.08407 12.5234 4.45854C12.5234 3.83302 12.2749 3.23311 11.8326 2.7908C11.3902 2.34849 10.7903 2.1 10.1648 2.1C9.53928 2.1 8.93938 2.34849 8.49707 2.7908L3.55663 7.83265C3.22373 8.16017 2.95897 8.55037 2.77762 8.98072C2.59628 9.41108 2.50193 9.87308 2.50003 10.3401C2.49813 10.8071 2.58871 11.2698 2.76654 11.7017C2.94438 12.1335 3.20595 12.5258 3.53618 12.856C3.8664 13.1863 4.25873 13.4478 4.69055 13.6257C5.12237 13.8035 5.58513 13.8941 6.05213 13.8922C6.51913 13.8903 6.98114 13.7959 7.41149 13.6146C7.84185 13.4332 8.23204 13.1685 8.55957 12.8356L13.5 7.79373" stroke="#C4CAD4" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -31,7 +31,6 @@
      "ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
      "ctrl-0": ["zed::ResetBufferFontSize", { "persist": false }],
      "ctrl-,": "zed::OpenSettings",
-      "ctrl-alt-,": "zed::OpenSettingsFile",
      "ctrl-q": "zed::Quit",
      "f4": "debugger::Start",
      "shift-f5": "debugger::Stop",
@@ -251,7 +250,7 @@
      "alt-enter": "agent::ContinueWithBurnMode",
      "ctrl-y": "agent::AllowOnce",
      "ctrl-alt-y": "agent::AllowAlways",
-      "ctrl-alt-z": "agent::RejectOnce"
+      "ctrl-d": "agent::RejectOnce"
    }
  },
  {
@@ -370,8 +369,7 @@
    "bindings": {
      "new": "rules_library::NewRule",
      "ctrl-n": "rules_library::NewRule",
-      "ctrl-shift-s": "rules_library::ToggleDefaultRule",
-      "ctrl-w": "workspace::CloseWindow"
+      "ctrl-shift-s": "rules_library::ToggleDefaultRule"
    }
  },
  {
@@ -527,15 +525,15 @@
      "ctrl-k ctrl-l": "editor::ToggleFold",
      "ctrl-k ctrl-[": "editor::FoldRecursive",
      "ctrl-k ctrl-]": "editor::UnfoldRecursive",
-      "ctrl-k ctrl-1": "editor::FoldAtLevel_1",
-      "ctrl-k ctrl-2": "editor::FoldAtLevel_2",
-      "ctrl-k ctrl-3": "editor::FoldAtLevel_3",
-      "ctrl-k ctrl-4": "editor::FoldAtLevel_4",
-      "ctrl-k ctrl-5": "editor::FoldAtLevel_5",
-      "ctrl-k ctrl-6": "editor::FoldAtLevel_6",
-      "ctrl-k ctrl-7": "editor::FoldAtLevel_7",
-      "ctrl-k ctrl-8": "editor::FoldAtLevel_8",
-      "ctrl-k ctrl-9": "editor::FoldAtLevel_9",
+      "ctrl-k ctrl-1": ["editor::FoldAtLevel", 1],
+      "ctrl-k ctrl-2": ["editor::FoldAtLevel", 2],
+      "ctrl-k ctrl-3": ["editor::FoldAtLevel", 3],
+      "ctrl-k ctrl-4": ["editor::FoldAtLevel", 4],
+      "ctrl-k ctrl-5": ["editor::FoldAtLevel", 5],
+      "ctrl-k ctrl-6": ["editor::FoldAtLevel", 6],
+      "ctrl-k ctrl-7": ["editor::FoldAtLevel", 7],
+      "ctrl-k ctrl-8": ["editor::FoldAtLevel", 8],
+      "ctrl-k ctrl-9": ["editor::FoldAtLevel", 9],
      "ctrl-k ctrl-0": "editor::FoldAll",
      "ctrl-k ctrl-j": "editor::UnfoldAll",
      "ctrl-space": "editor::ShowCompletions",
@@ -621,7 +619,7 @@
      "ctrl-shift-f": "pane::DeploySearch",
      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
      "ctrl-shift-t": "pane::ReopenClosedItem",
-      "ctrl-k ctrl-s": "zed::OpenKeymap",
+      "ctrl-k ctrl-s": "zed::OpenKeymapEditor",
      "ctrl-k ctrl-t": "theme_selector::Toggle",
      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
      "ctrl-t": "project_symbols::Toggle",
@@ -1229,6 +1227,9 @@
    "context": "Onboarding",
    "use_key_equivalents": true,
    "bindings": {
+      "ctrl-1": "onboarding::ActivateBasicsPage",
+      "ctrl-2": "onboarding::ActivateEditingPage",
+      "ctrl-3": "onboarding::ActivateAISetupPage",
      "ctrl-enter": "onboarding::Finish",
      "alt-shift-l": "onboarding::SignIn",
      "alt-shift-a": "onboarding::OpenAccount"
@@ -1240,44 +1241,5 @@
    "bindings": {
      "ctrl-shift-enter": "workspace::OpenWithSystem"
    }
-  },
-  {
-    "context": "SettingsWindow",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-w": "workspace::CloseWindow",
-      "escape": "workspace::CloseWindow",
-      "ctrl-m": "settings_editor::Minimize",
-      "ctrl-f": "search::FocusSearch",
-      "left": "settings_editor::ToggleFocusNav",
-      "ctrl-shift-e": "settings_editor::ToggleFocusNav",
-      // todo(settings_ui): cut this down based on the max files and overflow UI
-      "ctrl-1": ["settings_editor::FocusFile", 0],
-      "ctrl-2": ["settings_editor::FocusFile", 1],
-      "ctrl-3": ["settings_editor::FocusFile", 2],
-      "ctrl-4": ["settings_editor::FocusFile", 3],
-      "ctrl-5": ["settings_editor::FocusFile", 4],
-      "ctrl-6": ["settings_editor::FocusFile", 5],
-      "ctrl-7": ["settings_editor::FocusFile", 6],
-      "ctrl-8": ["settings_editor::FocusFile", 7],
-      "ctrl-9": ["settings_editor::FocusFile", 8],
-      "ctrl-0": ["settings_editor::FocusFile", 9],
-      "ctrl-pageup": "settings_editor::FocusPreviousFile",
-      "ctrl-pagedown": "settings_editor::FocusNextFile"
-    }
-  },
-  {
-    "context": "SettingsWindow > NavigationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "settings_editor::FocusPreviousNavEntry",
-      "down": "settings_editor::FocusNextNavEntry",
-      "right": "settings_editor::ExpandNavEntry",
-      "left": "settings_editor::CollapseNavEntry",
-      "pageup": "settings_editor::FocusPreviousRootNavEntry",
-      "pagedown": "settings_editor::FocusNextRootNavEntry",
-      "home": "settings_editor::FocusFirstNavEntry",
-      "end": "settings_editor::FocusLastNavEntry"
-    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -40,7 +40,6 @@
      "cmd--": ["zed::DecreaseBufferFontSize", { "persist": false }],
      "cmd-0": ["zed::ResetBufferFontSize", { "persist": false }],
      "cmd-,": "zed::OpenSettings",
-      "cmd-alt-,": "zed::OpenSettingsFile",
      "cmd-q": "zed::Quit",
      "cmd-h": "zed::Hide",
      "alt-cmd-h": "zed::HideOthers",
@@ -290,7 +289,7 @@
      "alt-enter": "agent::ContinueWithBurnMode",
      "cmd-y": "agent::AllowOnce",
      "cmd-alt-y": "agent::AllowAlways",
-      "cmd-alt-z": "agent::RejectOnce"
+      "cmd-d": "agent::RejectOnce"
    }
  },
  {
@@ -582,15 +581,15 @@
      "cmd-k cmd-l": "editor::ToggleFold",
      "cmd-k cmd-[": "editor::FoldRecursive",
      "cmd-k cmd-]": "editor::UnfoldRecursive",
-      "cmd-k cmd-1": "editor::FoldAtLevel_1",
-      "cmd-k cmd-2": "editor::FoldAtLevel_2",
-      "cmd-k cmd-3": "editor::FoldAtLevel_3",
-      "cmd-k cmd-4": "editor::FoldAtLevel_4",
-      "cmd-k cmd-5": "editor::FoldAtLevel_5",
-      "cmd-k cmd-6": "editor::FoldAtLevel_6",
-      "cmd-k cmd-7": "editor::FoldAtLevel_7",
-      "cmd-k cmd-8": "editor::FoldAtLevel_8",
-      "cmd-k cmd-9": "editor::FoldAtLevel_9",
+      "cmd-k cmd-1": ["editor::FoldAtLevel", 1],
+      "cmd-k cmd-2": ["editor::FoldAtLevel", 2],
+      "cmd-k cmd-3": ["editor::FoldAtLevel", 3],
+      "cmd-k cmd-4": ["editor::FoldAtLevel", 4],
+      "cmd-k cmd-5": ["editor::FoldAtLevel", 5],
+      "cmd-k cmd-6": ["editor::FoldAtLevel", 6],
+      "cmd-k cmd-7": ["editor::FoldAtLevel", 7],
+      "cmd-k cmd-8": ["editor::FoldAtLevel", 8],
+      "cmd-k cmd-9": ["editor::FoldAtLevel", 9],
      "cmd-k cmd-0": "editor::FoldAll",
      "cmd-k cmd-j": "editor::UnfoldAll",
      // Using `ctrl-space` / `ctrl-shift-space` in Zed requires disabling the macOS global shortcut.
@@ -690,7 +689,7 @@
      "cmd-shift-f": "pane::DeploySearch",
      "cmd-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
      "cmd-shift-t": "pane::ReopenClosedItem",
-      "cmd-k cmd-s": "zed::OpenKeymap",
+      "cmd-k cmd-s": "zed::OpenKeymapEditor",
      "cmd-k cmd-t": "theme_selector::Toggle",
      "ctrl-alt-cmd-p": "settings_profile_selector::Toggle",
      "cmd-t": "project_symbols::Toggle",
@@ -1334,7 +1333,10 @@
    "context": "Onboarding",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-enter": "onboarding::Finish",
+      "cmd-1": "onboarding::ActivateBasicsPage",
+      "cmd-2": "onboarding::ActivateEditingPage",
+      "cmd-3": "onboarding::ActivateAISetupPage",
+      "cmd-escape": "onboarding::Finish",
      "alt-tab": "onboarding::SignIn",
      "alt-shift-a": "onboarding::OpenAccount"
    }
@@ -1345,44 +1347,5 @@
    "bindings": {
      "ctrl-shift-enter": "workspace::OpenWithSystem"
    }
-  },
-  {
-    "context": "SettingsWindow",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-w": "workspace::CloseWindow",
-      "escape": "workspace::CloseWindow",
-      "cmd-m": "settings_editor::Minimize",
-      "cmd-f": "search::FocusSearch",
-      "left": "settings_editor::ToggleFocusNav",
-      "cmd-shift-e": "settings_editor::ToggleFocusNav",
-      // todo(settings_ui): cut this down based on the max files and overflow UI
-      "ctrl-1": ["settings_editor::FocusFile", 0],
-      "ctrl-2": ["settings_editor::FocusFile", 1],
-      "ctrl-3": ["settings_editor::FocusFile", 2],
-      "ctrl-4": ["settings_editor::FocusFile", 3],
-      "ctrl-5": ["settings_editor::FocusFile", 4],
-      "ctrl-6": ["settings_editor::FocusFile", 5],
-      "ctrl-7": ["settings_editor::FocusFile", 6],
-      "ctrl-8": ["settings_editor::FocusFile", 7],
-      "ctrl-9": ["settings_editor::FocusFile", 8],
-      "ctrl-0": ["settings_editor::FocusFile", 9],
-      "cmd-{": "settings_editor::FocusPreviousFile",
-      "cmd-}": "settings_editor::FocusNextFile"
-    }
-  },
-  {
-    "context": "SettingsWindow > NavigationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "settings_editor::FocusPreviousNavEntry",
-      "down": "settings_editor::FocusNextNavEntry",
-      "right": "settings_editor::ExpandNavEntry",
-      "left": "settings_editor::CollapseNavEntry",
-      "pageup": "settings_editor::FocusPreviousRootNavEntry",
-      "pagedown": "settings_editor::FocusNextRootNavEntry",
-      "home": "settings_editor::FocusFirstNavEntry",
-      "end": "settings_editor::FocusLastNavEntry"
-    }
  }
 ]
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -30,7 +30,6 @@
      "ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
      "ctrl-0": ["zed::ResetBufferFontSize", { "persist": false }],
      "ctrl-,": "zed::OpenSettings",
-      "ctrl-alt-,": "zed::OpenSettingsFile",
      "ctrl-q": "zed::Quit",
      "f4": "debugger::Start",
      "shift-f5": "debugger::Stop",
@@ -134,7 +133,7 @@
      "ctrl-k z": "editor::ToggleSoftWrap",
      "ctrl-f": "buffer_search::Deploy",
      "ctrl-h": "buffer_search::DeployReplace",
-      "ctrl-shift-.": "agent::QuoteSelection",
+      "ctrl-shift-.": "assistant::QuoteSelection",
      "ctrl-shift-,": "assistant::InsertIntoEditor",
      "shift-alt-e": "editor::SelectEnclosingSymbol",
      "ctrl-shift-backspace": "editor::GoToPreviousChange",
@@ -244,7 +243,7 @@
      "ctrl-shift-i": "agent::ToggleOptionsMenu",
      // "ctrl-shift-alt-n": "agent::ToggleNewThreadMenu",
      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "ctrl-shift-.": "agent::QuoteSelection",
+      "ctrl-shift-.": "assistant::QuoteSelection",
      "shift-alt-e": "agent::RemoveAllContext",
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-enter": "agent::ContinueThread",
@@ -252,7 +251,7 @@
      "alt-enter": "agent::ContinueWithBurnMode",
      "ctrl-y": "agent::AllowOnce",
      "ctrl-alt-y": "agent::AllowAlways",
-      "ctrl-alt-z": "agent::RejectOnce"
+      "ctrl-d": "agent::RejectOnce"
    }
  },
  {
@@ -379,8 +378,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-n": "rules_library::NewRule",
-      "ctrl-shift-s": "rules_library::ToggleDefaultRule",
-      "ctrl-w": "workspace::CloseWindow"
+      "ctrl-shift-s": "rules_library::ToggleDefaultRule"
    }
  },
  {
@@ -536,15 +534,15 @@
      "ctrl-k ctrl-l": "editor::ToggleFold",
      "ctrl-k ctrl-[": "editor::FoldRecursive",
      "ctrl-k ctrl-]": "editor::UnfoldRecursive",
-      "ctrl-k ctrl-1": "editor::FoldAtLevel_1",
-      "ctrl-k ctrl-2": "editor::FoldAtLevel_2",
-      "ctrl-k ctrl-3": "editor::FoldAtLevel_3",
-      "ctrl-k ctrl-4": "editor::FoldAtLevel_4",
-      "ctrl-k ctrl-5": "editor::FoldAtLevel_5",
-      "ctrl-k ctrl-6": "editor::FoldAtLevel_6",
-      "ctrl-k ctrl-7": "editor::FoldAtLevel_7",
-      "ctrl-k ctrl-8": "editor::FoldAtLevel_8",
-      "ctrl-k ctrl-9": "editor::FoldAtLevel_9",
+      "ctrl-k ctrl-1": ["editor::FoldAtLevel", 1],
+      "ctrl-k ctrl-2": ["editor::FoldAtLevel", 2],
+      "ctrl-k ctrl-3": ["editor::FoldAtLevel", 3],
+      "ctrl-k ctrl-4": ["editor::FoldAtLevel", 4],
+      "ctrl-k ctrl-5": ["editor::FoldAtLevel", 5],
+      "ctrl-k ctrl-6": ["editor::FoldAtLevel", 6],
+      "ctrl-k ctrl-7": ["editor::FoldAtLevel", 7],
+      "ctrl-k ctrl-8": ["editor::FoldAtLevel", 8],
+      "ctrl-k ctrl-9": ["editor::FoldAtLevel", 9],
      "ctrl-k ctrl-0": "editor::FoldAll",
      "ctrl-k ctrl-j": "editor::UnfoldAll",
      "ctrl-space": "editor::ShowCompletions",
@@ -623,7 +621,7 @@
      "ctrl-shift-f": "pane::DeploySearch",
      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
      "ctrl-shift-t": "pane::ReopenClosedItem",
-      "ctrl-k ctrl-s": "zed::OpenKeymap",
+      "ctrl-k ctrl-s": "zed::OpenKeymapEditor",
      "ctrl-k ctrl-t": "theme_selector::Toggle",
      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
      "ctrl-t": "project_symbols::Toggle",
@@ -1257,48 +1255,12 @@
    "context": "Onboarding",
    "use_key_equivalents": true,
    "bindings": {
+      "ctrl-1": "onboarding::ActivateBasicsPage",
+      "ctrl-2": "onboarding::ActivateEditingPage",
+      "ctrl-3": "onboarding::ActivateAISetupPage",
      "ctrl-enter": "onboarding::Finish",
      "alt-shift-l": "onboarding::SignIn",
      "shift-alt-a": "onboarding::OpenAccount"
    }
-  },
-  {
-    "context": "SettingsWindow",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-w": "workspace::CloseWindow",
-      "escape": "workspace::CloseWindow",
-      "ctrl-m": "settings_editor::Minimize",
-      "ctrl-f": "search::FocusSearch",
-      "left": "settings_editor::ToggleFocusNav",
-      "ctrl-shift-e": "settings_editor::ToggleFocusNav",
-      // todo(settings_ui): cut this down based on the max files and overflow UI
-      "ctrl-1": ["settings_editor::FocusFile", 0],
-      "ctrl-2": ["settings_editor::FocusFile", 1],
-      "ctrl-3": ["settings_editor::FocusFile", 2],
-      "ctrl-4": ["settings_editor::FocusFile", 3],
-      "ctrl-5": ["settings_editor::FocusFile", 4],
-      "ctrl-6": ["settings_editor::FocusFile", 5],
-      "ctrl-7": ["settings_editor::FocusFile", 6],
-      "ctrl-8": ["settings_editor::FocusFile", 7],
-      "ctrl-9": ["settings_editor::FocusFile", 8],
-      "ctrl-0": ["settings_editor::FocusFile", 9],
-      "ctrl-pageup": "settings_editor::FocusPreviousFile",
-      "ctrl-pagedown": "settings_editor::FocusNextFile"
-    }
-  },
-  {
-    "context": "SettingsWindow > NavigationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "settings_editor::FocusPreviousNavEntry",
-      "down": "settings_editor::FocusNextNavEntry",
-      "right": "settings_editor::ExpandNavEntry",
-      "left": "settings_editor::CollapseNavEntry",
-      "pageup": "settings_editor::FocusPreviousRootNavEntry",
-      "pagedown": "settings_editor::FocusNextRootNavEntry",
-      "home": "settings_editor::FocusFirstNavEntry",
-      "end": "settings_editor::FocusLastNavEntry"
-    }
  }
 ]
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -1,7 +1,7 @@
 [
  {
    "bindings": {
-      "ctrl-alt-s": "zed::OpenSettingsFile",
+      "ctrl-alt-s": "zed::OpenSettings",
      "ctrl-{": "pane::ActivatePreviousItem",
      "ctrl-}": "pane::ActivateNextItem",
      "shift-escape": null, // Unmap workspace::zoom
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -240,7 +240,7 @@
      "delete": "vim::DeleteRight",
      "g shift-j": "vim::JoinLinesNoWhitespace",
      "y": "vim::PushYank",
-      "shift-y": "vim::YankLine",
+      "shift-y": "vim::YankToEndOfLine",
      "x": "vim::DeleteRight",
      "shift-x": "vim::DeleteLeft",
      "ctrl-a": "vim::Increment",
@@ -393,7 +393,7 @@
      "escape": "editor::Cancel",
      "shift-d": "vim::DeleteToEndOfLine",
      "shift-j": "vim::JoinLines",
-      "shift-y": "vim::YankLine",
+      "shift-y": "vim::YankToEndOfLine",
      "shift-i": "vim::InsertFirstNonWhitespace",
      "shift-a": "vim::InsertEndOfLine",
      "o": "vim::InsertLineBelow",
@@ -580,18 +580,18 @@
      // "q": "vim::AnyQuotes",
      "q": "vim::MiniQuotes",
      "|": "vim::VerticalBars",
-      "(": ["vim::Parentheses", { "opening": true }],
+      "(": "vim::Parentheses",
      ")": "vim::Parentheses",
      "b": "vim::Parentheses",
      // "b": "vim::AnyBrackets",
      // "b": "vim::MiniBrackets",
-      "[": ["vim::SquareBrackets", { "opening": true }],
+      "[": "vim::SquareBrackets",
      "]": "vim::SquareBrackets",
      "r": "vim::SquareBrackets",
-      "{": ["vim::CurlyBrackets", { "opening": true }],
+      "{": "vim::CurlyBrackets",
      "}": "vim::CurlyBrackets",
      "shift-b": "vim::CurlyBrackets",
-      "<": ["vim::AngleBrackets", { "opening": true }],
+      "<": "vim::AngleBrackets",
      ">": "vim::AngleBrackets",
      "a": "vim::Argument",
      "i": "vim::IndentObj",
@@ -884,12 +884,10 @@
      "/": "project_panel::NewSearchInDirectory",
      "d": "project_panel::NewDirectory",
      "enter": "project_panel::OpenPermanent",
-      "escape": "vim::ToggleProjectPanelFocus",
+      "escape": "project_panel::ToggleFocus",
      "h": "project_panel::CollapseSelectedEntry",
-      "j": "vim::MenuSelectNext",
-      "k": "vim::MenuSelectPrevious",
-      "down": "vim::MenuSelectNext",
-      "up": "vim::MenuSelectPrevious",
+      "j": "menu::SelectNext",
+      "k": "menu::SelectPrevious",
      "l": "project_panel::ExpandSelectedEntry",
      "shift-d": "project_panel::Delete",
      "shift-r": "project_panel::Rename",
@@ -908,22 +906,7 @@
      "{": "project_panel::SelectPrevDirectory",
      "shift-g": "menu::SelectLast",
      "g g": "menu::SelectFirst",
-      "-": "project_panel::SelectParent",
-      "ctrl-u": "project_panel::ScrollUp",
-      "ctrl-d": "project_panel::ScrollDown",
-      "z t": "project_panel::ScrollCursorTop",
-      "z z": "project_panel::ScrollCursorCenter",
-      "z b": "project_panel::ScrollCursorBottom",
-      "0": ["vim::Number", 0],
-      "1": ["vim::Number", 1],
-      "2": ["vim::Number", 2],
-      "3": ["vim::Number", 3],
-      "4": ["vim::Number", 4],
-      "5": ["vim::Number", 5],
-      "6": ["vim::Number", 6],
-      "7": ["vim::Number", 7],
-      "8": ["vim::Number", 8],
-      "9": ["vim::Number", 9]
+      "-": "project_panel::SelectParent"
    }
  },
  {
--- a/assets/prompts/content_prompt.hbs
+++ b/assets/prompts/content_prompt.hbs
@@ -29,9 +29,7 @@ Generate {{content_type}} based on the following prompt:

 Match the indentation in the original file in the inserted {{content_type}}, don't include any indentation on blank lines.

-Return ONLY the {{content_type}} to insert. Do NOT include any XML tags like <document>, <insert_here>, or any surrounding markup from the input.
-
-Respond with a code block containing the {{content_type}} to insert. Replace \{{INSERTED_CODE}} with your actual {{content_type}}:
+Immediately start with the following format with no remarks:

 ```
 \{{INSERTED_CODE}}
@@ -68,9 +66,7 @@ Only make changes that are necessary to fulfill the prompt, leave everything els

 Start at the indentation level in the original file in the rewritten {{content_type}}. Don't stop until you've rewritten the entire section, even if you have no more changes to make, always write out the whole section with no unnecessary elisions.

-Return ONLY the rewritten {{content_type}}. Do NOT include any XML tags like <document>, <rewrite_this>, or any surrounding markup from the input.
-
-Respond with a code block containing the rewritten {{content_type}}. Replace \{{REWRITTEN_CODE}} with your actual rewritten {{content_type}}:
+Immediately start with the following format with no remarks:

 ```
 \{{REWRITTEN_CODE}}
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1,8 +1,5 @@
 {
-  "$schema": "zed://schemas/settings",
-  /// The displayed name of this project. If not set or empty, the root directory name
-  /// will be displayed.
-  "project_name": "",
+  "project_name": null,
  // The name of the Zed theme to use for the UI.
  //
  // `mode` is one of:
@@ -75,10 +72,8 @@
  "ui_font_weight": 400,
  // The default font size for text in the UI
  "ui_font_size": 16,
-  // The default font size for agent responses in the agent panel. Falls back to the UI font size if unset.
-  "agent_ui_font_size": null,
-  // The default font size for user messages in the agent panel.
-  "agent_buffer_font_size": 12,
+  // The default font size for text in the agent panel. Falls back to the UI font size if unset.
+  "agent_font_size": null,
  // How much to fade out unused code.
  "unnecessary_code_fade": 0.3,
  // Active pane styling settings.
@@ -722,9 +717,7 @@
    // Whether to enable drag-and-drop operations in the project panel.
    "drag_and_drop": true,
    // Whether to hide the root entry when only one folder is open in the window.
-    "hide_root": false,
-    // Whether to hide the hidden entries in the project panel.
-    "hide_hidden": false
+    "hide_root": false
  },
  "outline_panel": {
    // Whether to show the outline panel button in the status bar
@@ -1104,7 +1097,7 @@
  // Removes any lines containing only whitespace at the end of the file and
  // ensures just one newline at the end.
  "ensure_final_newline_on_save": true,
-  // Whether or not to perform a buffer format before saving: [on, off]
+  // Whether or not to perform a buffer format before saving: [on, off, prettier, language_server]
  // Keep in mind, if the autosave with delay is enabled, format_on_save will be ignored
  "format_on_save": "on",
  // How to perform a buffer format. This setting can take 4 values:
@@ -1234,10 +1227,6 @@
    // 2. Hide the gutter
    //      "git_gutter": "hide"
    "git_gutter": "tracked_files",
-    /// Sets the debounce threshold (in milliseconds) after which changes are reflected in the git gutter.
-    ///
-    /// Default: 0
-    "gutter_debounce": 0,
    // Control whether the git blame information is shown inline,
    // in the currently focused line.
    "inline_blame": {
@@ -1253,9 +1242,6 @@
      // The minimum column number to show the inline blame information at
      "min_column": 0
    },
-    "blame": {
-      "show_avatar": true
-    },
    // Control which information is shown in the branch picker.
    "branch_picker": {
      "show_author_name": true
@@ -1314,18 +1300,15 @@
    //   "proxy": "",
    //   "proxy_no_verify": false
    // },
+    // Whether edit predictions are enabled when editing text threads.
+    // This setting has no effect if globally disabled.
+    "enabled_in_text_threads": true,
+
    "copilot": {
      "enterprise_uri": null,
      "proxy": null,
      "proxy_no_verify": null
-    },
-    "codestral": {
-      "model": null,
-      "max_tokens": null
-    },
-    // Whether edit predictions are enabled when editing text threads.
-    // This setting has no effect if globally disabled.
-    "enabled_in_text_threads": true
+    }
  },
  // Settings specific to journaling
  "journal": {
@@ -1339,8 +1322,6 @@
  },
  // Status bar-related settings.
  "status_bar": {
-    // Whether to show the status bar.
-    "experimental.show": true,
    // Whether to show the active language button in the status bar.
    "active_language_button": true,
    // Whether to show the cursor position button in the status bar.
@@ -1407,8 +1388,8 @@
    //  4. A box drawn around the following character
    //     "hollow"
    //
-    // Default: "block"
-    "cursor_shape": "block",
+    // Default: not set, defaults to "block"
+    "cursor_shape": null,
    // Set whether Alternate Scroll mode (code: ?1007) is active by default.
    // Alternate Scroll mode converts mouse scroll events into up / down key
    // presses when in the alternate screen (e.g. when running applications
@@ -1430,8 +1411,8 @@
    // Whether or not selecting text in the terminal will automatically
    // copy to the system clipboard.
    "copy_on_select": false,
-    // Whether to keep the text selection after copying it to the clipboard.
-    "keep_selection_on_copy": true,
+    // Whether to keep the text selection after copying it to the clipboard
+    "keep_selection_on_copy": false,
    // Whether to show the terminal button in the status bar
    "button": true,
    // Any key-value pairs added to this list will be added to the terminal's
@@ -1521,6 +1502,7 @@
    // A value of 45 preserves colorful themes while ensuring legibility.
    "minimum_contrast": 45
  },
+  "code_actions_on_format": {},
  // Settings related to running tasks.
  "tasks": {
    "variables": {},
@@ -1575,14 +1557,6 @@
  "auto_install_extensions": {
    "html": true
  },
-  // The capabilities granted to extensions.
-  //
-  // This list can be customized to restrict what extensions are able to do.
-  "granted_extension_capabilities": [
-    { "kind": "process:exec", "command": "*", "args": ["**"] },
-    { "kind": "download_file", "host": "*", "path": ["**"] },
-    { "kind": "npm:install", "package": "*" }
-  ],
  // Controls how completions are processed for this language.
  "completions": {
    // Controls how words are completed.
@@ -1690,7 +1664,9 @@
      "preferred_line_length": 72
    },
    "Go": {
-      "formatter": [{ "code_action": "source.organizeImports" }, { "language_server": {} }],
+      "code_actions_on_format": {
+        "source.organizeImports": true
+      },
      "debuggers": ["Delve"]
    },
    "GraphQL": {
@@ -1879,19 +1855,21 @@
  // Allows to enable/disable formatting with Prettier
  // and configure default Prettier, used when no project-level Prettier installation is found.
  "prettier": {
-    // Enables or disables formatting with Prettier for any given language.
-    "allowed": false,
-    // Forces Prettier integration to use a specific parser name when formatting files with the language.
-    "plugins": [],
-    // Default Prettier options, in the format as in package.json section for Prettier.
-    // If project installs Prettier via its package.json, these options will be ignored.
+    // // Whether to consider prettier formatter or not when attempting to format a file.
+    "allowed": false
+    //
+    // // Use regular Prettier json configuration.
+    // // If Prettier is allowed, Zed will use this for its Prettier instance for any applicable file, if
+    // // the project has no other Prettier installed.
+    // "plugins": [],
+    //
+    // // Use regular Prettier json configuration.
+    // // If Prettier is allowed, Zed will use this for its Prettier instance for any applicable file, if
+    // // the project has no other Prettier installed.
    // "trailingComma": "es5",
    // "tabWidth": 4,
    // "semi": false,
    // "singleQuote": true
-    // Forces Prettier integration to use a specific parser name when formatting files with the language
-    // when set to a non-empty string.
-    "parser": ""
  },
  // Settings for auto-closing of JSX tags.
  "jsx_tag_auto_close": {
@@ -2041,7 +2019,7 @@
  // Examples:
  // "profiles": {
  //   "Presenting": {
-  //     "agent_ui_font_size": 20.0,
+  //     "agent_font_size": 20.0,
  //     "buffer_font_size": 20.0,
  //     "theme": "One Light",
  //     "ui_font_size": 20.0
@@ -2054,7 +2032,7 @@
  //     }
  //   }
  // }
-  "profiles": {},
+  "profiles": [],

  // A map of log scopes to the desired log level.
  // Useful for filtering out noisy logs or enabling more verbose logging.
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -192,7 +192,7 @@
            "font_weight": null
          },
          "comment": {
-            "color": "#5c6773ff",
+            "color": "#abb5be8c",
            "font_style": null,
            "font_weight": null
          },
@@ -583,7 +583,7 @@
            "font_weight": null
          },
          "comment": {
-            "color": "#abb0b6ff",
+            "color": "#787b8099",
            "font_style": null,
            "font_weight": null
          },
@@ -630,7 +630,7 @@
          "hint": {
            "color": "#8ca7c2ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#fa8d3eff",
@@ -974,7 +974,7 @@
            "font_weight": null
          },
          "comment": {
-            "color": "#5c6773ff",
+            "color": "#b8cfe680",
            "font_style": null,
            "font_weight": null
          },
@@ -1021,7 +1021,7 @@
          "hint": {
            "color": "#7399a3ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#ffad65ff",
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -653,7 +653,7 @@
          "hint": {
            "color": "#8c957dff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#fb4833ff",
@@ -1058,7 +1058,7 @@
          "hint": {
            "color": "#8c957dff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#fb4833ff",
@@ -1463,7 +1463,7 @@
          "hint": {
            "color": "#677562ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#9d0006ff",
@@ -1868,7 +1868,7 @@
          "hint": {
            "color": "#677562ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#9d0006ff",
@@ -2273,7 +2273,7 @@
          "hint": {
            "color": "#677562ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#9d0006ff",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -643,7 +643,7 @@
          "hint": {
            "color": "#7274a7ff",
            "font_style": null,
-            "font_weight": null
+            "font_weight": 700
          },
          "keyword": {
            "color": "#a449abff",
--- a/clippy.toml
+++ b/clippy.toml
@@ -9,8 +9,6 @@ disallowed-methods = [
    { path = "std::process::Command::spawn", reason = "Spawning `std::process::Command` can block the current thread for an unknown duration", replacement = "smol::process::Command::spawn" },
    { path = "std::process::Command::output", reason = "Spawning `std::process::Command` can block the current thread for an unknown duration", replacement = "smol::process::Command::output" },
    { path = "std::process::Command::status", reason = "Spawning `std::process::Command` can block the current thread for an unknown duration", replacement = "smol::process::Command::status" },
-    { path = "serde_json::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892. Use `serde_json::from_slice` instead." },
-    { path = "serde_json_lenient::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892, Use `serde_json_lenient::from_slice` instead." },
 ]
 disallowed-types = [
    # { path = "std::collections::HashMap", replacement = "collections::HashMap" },
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3,7 +3,6 @@ mod diff;
 mod mention;
 mod terminal;

-use ::terminal::terminal_settings::TerminalSettings;
 use agent_settings::AgentSettings;
 use collections::HashSet;
 pub use connection::*;
@@ -12,7 +11,7 @@ use language::language_settings::FormatOnSave;
 pub use mention::*;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
 use serde::{Deserialize, Serialize};
-use settings::{Settings as _, SettingsLocation};
+use settings::Settings as _;
 use task::{Shell, ShellBuilder};
 pub use terminal::*;

@@ -35,7 +34,7 @@ use std::rc::Rc;
 use std::time::{Duration, Instant};
 use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
 use ui::App;
-use util::{ResultExt, get_default_system_shell_preferring_bash};
+use util::{ResultExt, get_default_system_shell};
 use uuid::Uuid;

 #[derive(Debug)]
@@ -788,8 +787,6 @@ pub struct AcpThread {
    prompt_capabilities: acp::PromptCapabilities,
    _observe_prompt_capabilities: Task<anyhow::Result<()>>,
    terminals: HashMap<acp::TerminalId, Entity<Terminal>>,
-    pending_terminal_output: HashMap<acp::TerminalId, Vec<Vec<u8>>>,
-    pending_terminal_exit: HashMap<acp::TerminalId, acp::TerminalExitStatus>,
 }

 #[derive(Debug)]
@@ -812,126 +809,6 @@ pub enum AcpThreadEvent {

 impl EventEmitter<AcpThreadEvent> for AcpThread {}

-#[derive(Debug, Clone)]
-pub enum TerminalProviderEvent {
-    Created {
-        terminal_id: acp::TerminalId,
-        label: String,
-        cwd: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        terminal: Entity<::terminal::Terminal>,
-    },
-    Output {
-        terminal_id: acp::TerminalId,
-        data: Vec<u8>,
-    },
-    TitleChanged {
-        terminal_id: acp::TerminalId,
-        title: String,
-    },
-    Exit {
-        terminal_id: acp::TerminalId,
-        status: acp::TerminalExitStatus,
-    },
-}
-
-#[derive(Debug, Clone)]
-pub enum TerminalProviderCommand {
-    WriteInput {
-        terminal_id: acp::TerminalId,
-        bytes: Vec<u8>,
-    },
-    Resize {
-        terminal_id: acp::TerminalId,
-        cols: u16,
-        rows: u16,
-    },
-    Close {
-        terminal_id: acp::TerminalId,
-    },
-}
-
-impl AcpThread {
-    pub fn on_terminal_provider_event(
-        &mut self,
-        event: TerminalProviderEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            TerminalProviderEvent::Created {
-                terminal_id,
-                label,
-                cwd,
-                output_byte_limit,
-                terminal,
-            } => {
-                let entity = self.register_terminal_created(
-                    terminal_id.clone(),
-                    label,
-                    cwd,
-                    output_byte_limit,
-                    terminal,
-                    cx,
-                );
-
-                if let Some(mut chunks) = self.pending_terminal_output.remove(&terminal_id) {
-                    for data in chunks.drain(..) {
-                        entity.update(cx, |term, cx| {
-                            term.inner().update(cx, |inner, cx| {
-                                inner.write_output(&data, cx);
-                            })
-                        });
-                    }
-                }
-
-                if let Some(_status) = self.pending_terminal_exit.remove(&terminal_id) {
-                    entity.update(cx, |_term, cx| {
-                        cx.notify();
-                    });
-                }
-
-                cx.notify();
-            }
-            TerminalProviderEvent::Output { terminal_id, data } => {
-                if let Some(entity) = self.terminals.get(&terminal_id) {
-                    entity.update(cx, |term, cx| {
-                        term.inner().update(cx, |inner, cx| {
-                            inner.write_output(&data, cx);
-                        })
-                    });
-                } else {
-                    self.pending_terminal_output
-                        .entry(terminal_id)
-                        .or_default()
-                        .push(data);
-                }
-            }
-            TerminalProviderEvent::TitleChanged { terminal_id, title } => {
-                if let Some(entity) = self.terminals.get(&terminal_id) {
-                    entity.update(cx, |term, cx| {
-                        term.inner().update(cx, |inner, cx| {
-                            inner.breadcrumb_text = title;
-                            cx.emit(::terminal::Event::BreadcrumbsChanged);
-                        })
-                    });
-                }
-            }
-            TerminalProviderEvent::Exit {
-                terminal_id,
-                status,
-            } => {
-                if let Some(entity) = self.terminals.get(&terminal_id) {
-                    entity.update(cx, |_term, cx| {
-                        cx.notify();
-                    });
-                } else {
-                    self.pending_terminal_exit.insert(terminal_id, status);
-                }
-            }
-        }
-    }
-}
-
 #[derive(PartialEq, Eq, Debug)]
 pub enum ThreadStatus {
    Idle,
@@ -1009,8 +886,6 @@ impl AcpThread {
            prompt_capabilities,
            _observe_prompt_capabilities: task,
            terminals: HashMap::default(),
-            pending_terminal_output: HashMap::default(),
-            pending_terminal_exit: HashMap::default(),
        }
    }

@@ -2086,24 +1961,16 @@ impl AcpThread {
    ) -> Task<Result<Entity<Terminal>>> {
        let env = match &cwd {
            Some(dir) => self.project.update(cx, |project, cx| {
-                let worktree = project.find_worktree(dir.as_path(), cx);
-                let shell = TerminalSettings::get(
-                    worktree.as_ref().map(|(worktree, path)| SettingsLocation {
-                        worktree_id: worktree.read(cx).id(),
-                        path: &path,
-                    }),
-                    cx,
-                )
-                .shell
-                .clone();
-                project.directory_environment(&shell, dir.as_path().into(), cx)
+                project.directory_environment(dir.as_path().into(), cx)
            }),
            None => Task::ready(None).shared(),
        };
+
        let env = cx.spawn(async move |_, _| {
            let mut env = env.await.unwrap_or_default();
-            // Disables paging for `git` and hopefully other commands
-            env.insert("PAGER".into(), "".into());
+            if cfg!(unix) {
+                env.insert("PAGER".into(), "cat".into());
+            }
            for var in extra_env {
                env.insert(var.name, var.value);
            }
@@ -2112,24 +1979,24 @@ impl AcpThread {

        let project = self.project.clone();
        let language_registry = project.read(cx).languages().clone();
-        let is_windows = project.read(cx).path_style(cx).is_windows();

        let terminal_id = acp::TerminalId(Uuid::new_v4().to_string().into());
        let terminal_task = cx.spawn({
            let terminal_id = terminal_id.clone();
            async move |_this, cx| {
                let env = env.await;
-                let shell = project
-                    .update(cx, |project, cx| {
-                        project
-                            .remote_client()
-                            .and_then(|r| r.read(cx).default_system_shell())
-                    })?
-                    .unwrap_or_else(|| get_default_system_shell_preferring_bash());
-                let (task_command, task_args) =
-                    ShellBuilder::new(&Shell::Program(shell), is_windows)
-                        .redirect_stdin_to_dev_null()
-                        .build(Some(command.clone()), &args);
+                let (task_command, task_args) = ShellBuilder::new(
+                    project
+                        .update(cx, |project, cx| {
+                            project
+                                .remote_client()
+                                .and_then(|r| r.read(cx).default_system_shell())
+                        })?
+                        .as_deref(),
+                    &Shell::Program(get_default_system_shell()),
+                )
+                .redirect_stdin_to_dev_null()
+                .build(Some(command.clone()), &args);
                let terminal = project
                    .update(cx, |project, cx| {
                        project.create_terminal_task(
@@ -2212,32 +2079,6 @@ impl AcpThread {
    pub fn emit_load_error(&mut self, error: LoadError, cx: &mut Context<Self>) {
        cx.emit(AcpThreadEvent::LoadError(error));
    }
-
-    pub fn register_terminal_created(
-        &mut self,
-        terminal_id: acp::TerminalId,
-        command_label: String,
-        working_dir: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        terminal: Entity<::terminal::Terminal>,
-        cx: &mut Context<Self>,
-    ) -> Entity<Terminal> {
-        let language_registry = self.project.read(cx).languages().clone();
-
-        let entity = cx.new(|cx| {
-            Terminal::new(
-                terminal_id.clone(),
-                &command_label,
-                working_dir.clone(),
-                output_byte_limit.map(|l| l as usize),
-                terminal,
-                language_registry,
-                cx,
-            )
-        });
-        self.terminals.insert(terminal_id.clone(), entity.clone());
-        entity
-    }
 }

 fn markdown_for_raw_output(
@@ -2314,145 +2155,6 @@ mod tests {
        });
    }

-    #[gpui::test]
-    async fn test_terminal_output_buffered_before_created_renders(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new());
-        let thread = cx
-            .update(|cx| connection.new_thread(project, std::path::Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
-
-        // Send Output BEFORE Created - should be buffered by acp_thread
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Output {
-                    terminal_id: terminal_id.clone(),
-                    data: b"hello buffered".to_vec(),
-                },
-                cx,
-            );
-        });
-
-        // Create a display-only terminal and then send Created
-        let lower = cx.new(|cx| {
-            let builder = ::terminal::TerminalBuilder::new_display_only(
-                ::terminal::terminal_settings::CursorShape::default(),
-                ::terminal::terminal_settings::AlternateScroll::On,
-                None,
-                0,
-            )
-            .unwrap();
-            builder.subscribe(cx)
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Created {
-                    terminal_id: terminal_id.clone(),
-                    label: "Buffered Test".to_string(),
-                    cwd: None,
-                    output_byte_limit: None,
-                    terminal: lower.clone(),
-                },
-                cx,
-            );
-        });
-
-        // After Created, buffered Output should have been flushed into the renderer
-        let content = thread.read_with(cx, |thread, cx| {
-            let term = thread.terminal(terminal_id.clone()).unwrap();
-            term.read_with(cx, |t, cx| t.inner().read(cx).get_content())
-        });
-
-        assert!(
-            content.contains("hello buffered"),
-            "expected buffered output to render, got: {content}"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_terminal_output_and_exit_buffered_before_created(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new());
-        let thread = cx
-            .update(|cx| connection.new_thread(project, std::path::Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
-
-        // Send Output BEFORE Created
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Output {
-                    terminal_id: terminal_id.clone(),
-                    data: b"pre-exit data".to_vec(),
-                },
-                cx,
-            );
-        });
-
-        // Send Exit BEFORE Created
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Exit {
-                    terminal_id: terminal_id.clone(),
-                    status: acp::TerminalExitStatus {
-                        exit_code: Some(0),
-                        signal: None,
-                        meta: None,
-                    },
-                },
-                cx,
-            );
-        });
-
-        // Now create a display-only lower-level terminal and send Created
-        let lower = cx.new(|cx| {
-            let builder = ::terminal::TerminalBuilder::new_display_only(
-                ::terminal::terminal_settings::CursorShape::default(),
-                ::terminal::terminal_settings::AlternateScroll::On,
-                None,
-                0,
-            )
-            .unwrap();
-            builder.subscribe(cx)
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Created {
-                    terminal_id: terminal_id.clone(),
-                    label: "Buffered Exit Test".to_string(),
-                    cwd: None,
-                    output_byte_limit: None,
-                    terminal: lower.clone(),
-                },
-                cx,
-            );
-        });
-
-        // Output should be present after Created (flushed from buffer)
-        let content = thread.read_with(cx, |thread, cx| {
-            let term = thread.terminal(terminal_id.clone()).unwrap();
-            term.read_with(cx, |t, cx| t.inner().read(cx).get_content())
-        });
-
-        assert!(
-            content.contains("pre-exit data"),
-            "expected pre-exit data to render, got: {content}"
-        );
-    }
-
    #[gpui::test]
    async fn test_push_user_content_block(cx: &mut gpui::TestAppContext) {
        init_test(cx);
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -31,7 +31,7 @@ impl Diff {
            let buffer = new_buffer.clone();
            async move |_, cx| {
                let language = language_registry
-                    .load_language_for_file_path(Path::new(&path))
+                    .language_for_file_path(Path::new(&path))
                    .await
                    .log_err();

--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -20,6 +20,7 @@ use std::{
    cmp::Reverse,
    collections::HashSet,
    fmt::Write,
+    path::Path,
    sync::Arc,
    time::{Duration, Instant},
 };
@@ -327,13 +328,17 @@ impl ActivityIndicator {
            .flatten()
    }

-    fn pending_environment_error<'a>(&'a self, cx: &'a App) -> Option<&'a EnvironmentErrorMessage> {
-        self.project.read(cx).peek_environment_error(cx)
+    fn pending_environment_errors<'a>(
+        &'a self,
+        cx: &'a App,
+    ) -> impl Iterator<Item = (&'a Arc<Path>, &'a EnvironmentErrorMessage)> {
+        self.project.read(cx).shell_environment_errors(cx)
    }

    fn content_to_render(&mut self, cx: &mut Context<Self>) -> Option<Content> {
        // Show if any direnv calls failed
-        if let Some(error) = self.pending_environment_error(cx) {
+        if let Some((abs_path, error)) = self.pending_environment_errors(cx).next() {
+            let abs_path = abs_path.clone();
            return Some(Content {
                icon: Some(
                    Icon::new(IconName::Warning)
@@ -343,7 +348,7 @@ impl ActivityIndicator {
                message: error.0.clone(),
                on_click: Some(Arc::new(move |this, window, cx| {
                    this.project.update(cx, |project, cx| {
-                        project.pop_environment_error(cx);
+                        project.remove_environment_error(&abs_path, cx);
                    });
                    window.dispatch_action(Box::new(workspace::OpenLog), cx);
                })),
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1276,6 +1276,62 @@ impl Thread {
        );
    }

+    pub fn retry_last_completion(
+        &mut self,
+        window: Option<AnyWindowHandle>,
+        cx: &mut Context<Self>,
+    ) {
+        // Clear any existing error state
+        self.retry_state = None;
+
+        // Use the last error context if available, otherwise fall back to configured model
+        let (model, intent) = if let Some((model, intent)) = self.last_error_context.take() {
+            (model, intent)
+        } else if let Some(configured_model) = self.configured_model.as_ref() {
+            let model = configured_model.model.clone();
+            let intent = if self.has_pending_tool_uses() {
+                CompletionIntent::ToolResults
+            } else {
+                CompletionIntent::UserPrompt
+            };
+            (model, intent)
+        } else if let Some(configured_model) = self.get_or_init_configured_model(cx) {
+            let model = configured_model.model.clone();
+            let intent = if self.has_pending_tool_uses() {
+                CompletionIntent::ToolResults
+            } else {
+                CompletionIntent::UserPrompt
+            };
+            (model, intent)
+        } else {
+            return;
+        };
+
+        self.send_to_model(model, intent, window, cx);
+    }
+
+    pub fn enable_burn_mode_and_retry(
+        &mut self,
+        window: Option<AnyWindowHandle>,
+        cx: &mut Context<Self>,
+    ) {
+        self.completion_mode = CompletionMode::Burn;
+        cx.emit(ThreadEvent::ProfileChanged);
+        self.retry_last_completion(window, cx);
+    }
+
+    pub fn used_tools_since_last_user_message(&self) -> bool {
+        for message in self.messages.iter().rev() {
+            if self.tool_use.message_has_tool_results(message.id) {
+                return true;
+            } else if message.role == Role::User {
+                return false;
+            }
+        }
+
+        false
+    }
+
    pub fn to_completion_request(
        &self,
        model: Arc<dyn LanguageModel>,
@@ -3220,6 +3276,7 @@ mod tests {
    use settings::{LanguageModelParameters, Settings, SettingsStore};
    use std::sync::Arc;
    use std::time::Duration;
+    use theme::ThemeSettings;
    use util::path;
    use workspace::Workspace;

@@ -5280,7 +5337,7 @@ fn main() {{
            thread_store::init(fs.clone(), cx);
            workspace::init_settings(cx);
            language_model::init_settings(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
+            ThemeSettings::register(cx);
            ToolRegistry::default_global(cx);
            assistant_tool::init(cx);

--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -38,7 +38,7 @@ use std::{
    cell::{Ref, RefCell},
    path::{Path, PathBuf},
    rc::Rc,
-    sync::{Arc, LazyLock, Mutex},
+    sync::{Arc, Mutex},
 };
 use util::{ResultExt as _, rel_path::RelPath};

@@ -74,19 +74,17 @@ impl Column for DataType {
    }
 }

-static RULES_FILE_NAMES: LazyLock<[&RelPath; 9]> = LazyLock::new(|| {
-    [
-        RelPath::unix(".rules").unwrap(),
-        RelPath::unix(".cursorrules").unwrap(),
-        RelPath::unix(".windsurfrules").unwrap(),
-        RelPath::unix(".clinerules").unwrap(),
-        RelPath::unix(".github/copilot-instructions.md").unwrap(),
-        RelPath::unix("CLAUDE.md").unwrap(),
-        RelPath::unix("AGENT.md").unwrap(),
-        RelPath::unix("AGENTS.md").unwrap(),
-        RelPath::unix("GEMINI.md").unwrap(),
-    ]
-});
+const RULES_FILE_NAMES: [&str; 9] = [
+    ".rules",
+    ".cursorrules",
+    ".windsurfrules",
+    ".clinerules",
+    ".github/copilot-instructions.md",
+    "CLAUDE.md",
+    "AGENT.md",
+    "AGENTS.md",
+    "GEMINI.md",
+];

 pub fn init(fs: Arc<dyn Fs>, cx: &mut App) {
    ThreadsDatabase::init(fs, cx);
@@ -234,10 +232,11 @@ impl ThreadStore {
                self.enqueue_system_prompt_reload();
            }
            project::Event::WorktreeUpdatedEntries(_, items) => {
-                if items
-                    .iter()
-                    .any(|(path, _, _)| RULES_FILE_NAMES.iter().any(|name| path.as_ref() == *name))
-                {
+                if items.iter().any(|(path, _, _)| {
+                    RULES_FILE_NAMES
+                        .iter()
+                        .any(|name| path.as_ref() == RelPath::unix(name).unwrap())
+                }) {
                    self.enqueue_system_prompt_reload();
                }
            }
@@ -369,7 +368,7 @@ impl ThreadStore {
            .into_iter()
            .filter_map(|name| {
                worktree
-                    .entry_for_path(name)
+                    .entry_for_path(RelPath::unix(name).unwrap())
                    .filter(|entry| entry.is_file())
                    .map(|entry| entry.path.clone())
            })
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1418,6 +1418,7 @@ mod tests {
    }

    #[gpui::test]
+    #[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
    async fn test_save_load_thread(cx: &mut TestAppContext) {
        init_test(cx);
        let fs = FakeFs::new(cx.executor());
@@ -1497,8 +1498,7 @@ mod tests {
        model.send_last_completion_stream_text_chunk("Lorem.");
        model.end_last_completion_stream();
        cx.run_until_parked();
-        summary_model
-            .send_last_completion_stream_text_chunk(&format!("Explaining {}", path!("/a/b.md")));
+        summary_model.send_last_completion_stream_text_chunk("Explaining /a/b.md");
        summary_model.end_last_completion_stream();

        send.await.unwrap();
@@ -1538,7 +1538,7 @@ mod tests {
            history_entries(&history_store, cx),
            vec![(
                HistoryEntryId::AcpThread(session_id.clone()),
-                format!("Explaining {}", path!("/a/b.md"))
+                "Explaining /a/b.md".into()
            )]
        );
        let acp_thread = agent
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -15,11 +15,10 @@ use agent_settings::{
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::adapt_schema_to_format;
 use chrono::{DateTime, Utc};
-use client::{ModelRequestUsage, RequestUsage, UserStore};
-use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, Plan, UsageLimit};
+use client::{ModelRequestUsage, RequestUsage};
+use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, UsageLimit};
 use collections::{HashMap, HashSet, IndexMap};
 use fs::Fs;
-use futures::stream;
 use futures::{
    FutureExt,
    channel::{mpsc, oneshot},
@@ -35,7 +34,7 @@ use language_model::{
    LanguageModelImage, LanguageModelProviderId, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
    LanguageModelToolResultContent, LanguageModelToolSchemaFormat, LanguageModelToolUse,
-    LanguageModelToolUseId, Role, SelectedModel, StopReason, TokenUsage, ZED_CLOUD_PROVIDER_ID,
+    LanguageModelToolUseId, Role, SelectedModel, StopReason, TokenUsage,
 };
 use project::{
    Project,
@@ -586,7 +585,6 @@ pub struct Thread {
    pending_title_generation: Option<Task<()>>,
    summary: Option<SharedString>,
    messages: Vec<Message>,
-    user_store: Entity<UserStore>,
    completion_mode: CompletionMode,
    /// Holds the task that handles agent interaction until the end of the turn.
    /// Survives across multiple requests as the model performs tool calls and
@@ -643,7 +641,6 @@ impl Thread {
            pending_title_generation: None,
            summary: None,
            messages: Vec::new(),
-            user_store: project.read(cx).user_store(),
            completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
            running_turn: None,
            pending_message: None,
@@ -823,7 +820,6 @@ impl Thread {
            pending_title_generation: None,
            summary: db_thread.detailed_summary,
            messages: db_thread.messages,
-            user_store: project.read(cx).user_store(),
            completion_mode: db_thread.completion_mode.unwrap_or_default(),
            running_turn: None,
            pending_message: None,
@@ -1253,12 +1249,12 @@ impl Thread {
            );

            log::debug!("Calling model.stream_completion, attempt {}", attempt);
-
-            let (mut events, mut error) = match model.stream_completion(request, cx).await {
-                Ok(events) => (events, None),
-                Err(err) => (stream::empty().boxed(), Some(err)),
-            };
+            let mut events = model
+                .stream_completion(request, cx)
+                .await
+                .map_err(|error| anyhow!(error))?;
            let mut tool_results = FuturesUnordered::new();
+            let mut error = None;
            while let Some(event) = events.next().await {
                log::trace!("Received completion event: {:?}", event);
                match event {
@@ -1306,10 +1302,8 @@ impl Thread {

            if let Some(error) = error {
                attempt += 1;
-                let retry = this.update(cx, |this, cx| {
-                    let user_store = this.user_store.read(cx);
-                    this.handle_completion_error(error, attempt, user_store.plan())
-                })??;
+                let retry =
+                    this.update(cx, |this, _| this.handle_completion_error(error, attempt))??;
                let timer = cx.background_executor().timer(retry.duration);
                event_stream.send_retry(retry);
                timer.await;
@@ -1336,23 +1330,8 @@ impl Thread {
        &mut self,
        error: LanguageModelCompletionError,
        attempt: u8,
-        plan: Option<Plan>,
    ) -> Result<acp_thread::RetryStatus> {
-        let Some(model) = self.model.as_ref() else {
-            return Err(anyhow!(error));
-        };
-
-        let auto_retry = if model.provider_id() == ZED_CLOUD_PROVIDER_ID {
-            match plan {
-                Some(Plan::V2(_)) => true,
-                Some(Plan::V1(_)) => self.completion_mode == CompletionMode::Burn,
-                None => false,
-            }
-        } else {
-            true
-        };
-
-        if !auto_retry {
+        if self.completion_mode == CompletionMode::Normal {
            return Err(anyhow!(error));
        }

--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -47,8 +47,6 @@ task.workspace = true
 tempfile.workspace = true
 thiserror.workspace = true
 ui.workspace = true
-terminal.workspace = true
-uuid.workspace = true
 util.workspace = true
 watch.workspace = true
 workspace-hack.workspace = true
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -9,7 +9,6 @@ use futures::io::BufReader;
 use project::Project;
 use project::agent_server_store::AgentServerCommand;
 use serde::Deserialize;
-use task::Shell;
 use util::ResultExt as _;

 use std::path::PathBuf;
@@ -20,9 +19,7 @@ use thiserror::Error;
 use anyhow::{Context as _, Result};
 use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntity};

-use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
-use terminal::TerminalBuilder;
-use terminal::terminal_settings::{AlternateScroll, CursorShape};
+use acp_thread::{AcpThread, AuthRequired, LoadError};

 #[derive(Debug, Error)]
 #[error("Unsupported version")]
@@ -82,7 +79,7 @@ impl AcpConnection {
        is_remote: bool,
        cx: &mut AsyncApp,
    ) -> Result<Self> {
-        let mut child = util::command::new_smol_command(&command.path);
+        let mut child = util::command::new_smol_command(command.path);
        child
            .args(command.args.iter().map(|arg| arg.as_str()))
            .envs(command.env.iter().flatten())
@@ -97,11 +94,6 @@ impl AcpConnection {
        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::info!(
-            "Spawning external agent server: {:?}, {:?}",
-            command.path,
-            command.args
-        );
        log::trace!("Spawned (pid: {})", child.id());

        let sessions = Rc::new(RefCell::new(HashMap::default()));
@@ -388,10 +380,6 @@ impl AgentConnection for AcpConnection {
            match result {
                Ok(response) => Ok(response),
                Err(err) => {
-                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
-                        return Err(anyhow!(acp::Error::auth_required()));
-                    }
-
                    if err.code != ErrorCode::INTERNAL_ERROR.code {
                        anyhow::bail!(err)
                    }
@@ -708,100 +696,10 @@ impl acp::Client for ClientDelegate {
            }
        }

-        // Clone so we can inspect meta both before and after handing off to the thread
-        let update_clone = notification.update.clone();
-
-        // Pre-handle: if a ToolCall carries terminal_info, create/register a display-only terminal.
-        if let acp::SessionUpdate::ToolCall(tc) = &update_clone {
-            if let Some(meta) = &tc.meta {
-                if let Some(terminal_info) = meta.get("terminal_info") {
-                    if let Some(id_str) = terminal_info.get("terminal_id").and_then(|v| v.as_str())
-                    {
-                        let terminal_id = acp::TerminalId(id_str.into());
-                        let cwd = terminal_info
-                            .get("cwd")
-                            .and_then(|v| v.as_str().map(PathBuf::from));
-
-                        // Create a minimal display-only lower-level terminal and register it.
-                        let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
-                            let builder = TerminalBuilder::new_display_only(
-                                CursorShape::default(),
-                                AlternateScroll::On,
-                                None,
-                                0,
-                            )?;
-                            let lower = cx.new(|cx| builder.subscribe(cx));
-                            thread.on_terminal_provider_event(
-                                TerminalProviderEvent::Created {
-                                    terminal_id: terminal_id.clone(),
-                                    label: tc.title.clone(),
-                                    cwd,
-                                    output_byte_limit: None,
-                                    terminal: lower,
-                                },
-                                cx,
-                            );
-                            anyhow::Ok(())
-                        });
-                    }
-                }
-            }
-        }
-
-        // Forward the update to the acp_thread as usual.
        session.thread.update(&mut self.cx.clone(), |thread, cx| {
-            thread.handle_session_update(notification.update.clone(), cx)
+            thread.handle_session_update(notification.update, cx)
        })??;

-        // Post-handle: stream terminal output/exit if present on ToolCallUpdate meta.
-        if let acp::SessionUpdate::ToolCallUpdate(tcu) = &update_clone {
-            if let Some(meta) = &tcu.meta {
-                if let Some(term_out) = meta.get("terminal_output") {
-                    if let Some(id_str) = term_out.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId(id_str.into());
-                        if let Some(s) = term_out.get("data").and_then(|v| v.as_str()) {
-                            let data = s.as_bytes().to_vec();
-                            let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
-                                thread.on_terminal_provider_event(
-                                    TerminalProviderEvent::Output {
-                                        terminal_id: terminal_id.clone(),
-                                        data,
-                                    },
-                                    cx,
-                                );
-                            });
-                        }
-                    }
-                }
-
-                // terminal_exit
-                if let Some(term_exit) = meta.get("terminal_exit") {
-                    if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId(id_str.into());
-                        let status = acp::TerminalExitStatus {
-                            exit_code: term_exit
-                                .get("exit_code")
-                                .and_then(|v| v.as_u64())
-                                .map(|i| i as u32),
-                            signal: term_exit
-                                .get("signal")
-                                .and_then(|v| v.as_str().map(|s| s.to_string())),
-                            meta: None,
-                        };
-                        let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
-                            thread.on_terminal_provider_event(
-                                TerminalProviderEvent::Exit {
-                                    terminal_id: terminal_id.clone(),
-                                    status,
-                                },
-                                cx,
-                            );
-                        });
-                    }
-                }
-            }
-        }
-
        Ok(())
    }

@@ -809,71 +707,25 @@ impl acp::Client for ClientDelegate {
        &self,
        args: acp::CreateTerminalRequest,
    ) -> Result<acp::CreateTerminalResponse, acp::Error> {
-        let thread = self.session_thread(&args.session_id)?;
-        let project = thread.read_with(&self.cx, |thread, _cx| thread.project().clone())?;
-
-        let mut env = if let Some(dir) = &args.cwd {
-            project
-                .update(&mut self.cx.clone(), |project, cx| {
-                    project.directory_environment(&task::Shell::System, dir.clone().into(), cx)
-                })?
-                .await
-                .unwrap_or_default()
-        } else {
-            Default::default()
-        };
-        for var in args.env {
-            env.insert(var.name, var.value);
-        }
-
-        // Use remote shell or default system shell, as appropriate
-        let shell = project
-            .update(&mut self.cx.clone(), |project, cx| {
-                project
-                    .remote_client()
-                    .and_then(|r| r.read(cx).default_system_shell())
-                    .map(Shell::Program)
-            })?
-            .unwrap_or(task::Shell::System);
-        let is_windows = project
-            .read_with(&self.cx, |project, cx| project.path_style(cx).is_windows())
-            .unwrap_or(cfg!(windows));
-        let (task_command, task_args) = task::ShellBuilder::new(&shell, is_windows)
-            .redirect_stdin_to_dev_null()
-            .build(Some(args.command.clone()), &args.args);
-
-        let terminal_entity = project
-            .update(&mut self.cx.clone(), |project, cx| {
-                project.create_terminal_task(
-                    task::SpawnInTerminal {
-                        command: Some(task_command),
-                        args: task_args,
-                        cwd: args.cwd.clone(),
-                        env,
-                        ..Default::default()
-                    },
+        let terminal = self
+            .session_thread(&args.session_id)?
+            .update(&mut self.cx.clone(), |thread, cx| {
+                thread.create_terminal(
+                    args.command,
+                    args.args,
+                    args.env,
+                    args.cwd,
+                    args.output_byte_limit,
                    cx,
                )
            })?
            .await?;
-
-        // Register with renderer
-        let terminal_entity = thread.update(&mut self.cx.clone(), |thread, cx| {
-            thread.register_terminal_created(
-                acp::TerminalId(uuid::Uuid::new_v4().to_string().into()),
-                format!("{} {}", args.command, args.args.join(" ")),
-                args.cwd.clone(),
-                args.output_byte_limit,
-                terminal_entity,
-                cx,
-            )
-        })?;
-        let terminal_id =
-            terminal_entity.read_with(&self.cx, |terminal, _| terminal.id().clone())?;
-        Ok(acp::CreateTerminalResponse {
-            terminal_id,
-            meta: None,
-        })
+        Ok(
+            terminal.read_with(&self.cx, |terminal, _| acp::CreateTerminalResponse {
+                terminal_id: terminal.id().clone(),
+                meta: None,
+            })?,
+        )
    }

    async fn kill_terminal_command(
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -1,6 +1,5 @@
 mod acp;
 mod claude;
-mod codex;
 mod custom;
 mod gemini;

@@ -9,7 +8,6 @@ pub mod e2e_tests;

 pub use claude::*;
 use client::ProxySettings;
-pub use codex::*;
 use collections::HashMap;
 pub use custom::*;
 use fs::Fs;
--- a/crates/agent_servers/src/codex.rs
+++ b/crates/agent_servers/src/codex.rs
@@ -1,80 +0,0 @@
-use std::rc::Rc;
-use std::{any::Any, path::Path};
-
-use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
-use acp_thread::AgentConnection;
-use anyhow::{Context as _, Result};
-use gpui::{App, SharedString, Task};
-use project::agent_server_store::CODEX_NAME;
-
-#[derive(Clone)]
-pub struct Codex;
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-
-    crate::common_e2e_tests!(async |_, _, _| Codex, allow_option_id = "proceed_once");
-}
-
-impl AgentServer for Codex {
-    fn telemetry_id(&self) -> &'static str {
-        "codex"
-    }
-
-    fn name(&self) -> SharedString {
-        "Codex".into()
-    }
-
-    fn logo(&self) -> ui::IconName {
-        ui::IconName::AiOpenAi
-    }
-
-    fn connect(
-        &self,
-        root_dir: Option<&Path>,
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
-        let is_remote = delegate.project.read(cx).is_via_remote_server();
-        let store = delegate.store.downgrade();
-        let extra_env = load_proxy_env(cx);
-        let default_mode = self.default_mode(cx);
-
-        cx.spawn(async move |cx| {
-            let (command, root_dir, login) = store
-                .update(cx, |store, cx| {
-                    let agent = store
-                        .get_external_agent(&CODEX_NAME.into())
-                        .context("Codex is not registered")?;
-                    anyhow::Ok(agent.get_command(
-                        root_dir.as_deref(),
-                        extra_env,
-                        delegate.status_tx,
-                        // For now, report that there are no updates.
-                        // (A future PR will use the GitHub Releases API to fetch them.)
-                        delegate.new_version_available,
-                        &mut cx.to_async(),
-                    ))
-                })??
-                .await?;
-
-            let connection = crate::acp::connect(
-                name,
-                command,
-                root_dir.as_ref(),
-                default_mode,
-                is_remote,
-                cx,
-            )
-            .await?;
-            Ok((connection, login))
-        })
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -483,13 +483,6 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
                    default_mode: None,
                }),
                gemini: Some(crate::gemini::tests::local_command().into()),
-                codex: Some(BuiltinAgentServerSettings {
-                    path: Some("codex-acp".into()),
-                    args: None,
-                    env: None,
-                    ignore_system_version: None,
-                    default_mode: None,
-                }),
                custom: collections::HashMap::default(),
            },
            cx,
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -151,7 +151,7 @@ impl Default for AgentProfileId {
 }

 impl Settings for AgentSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
        let agent = content.agent.clone().unwrap();
        Self {
            enabled: agent.enabled.unwrap(),
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -80,6 +80,7 @@ serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
 settings.workspace = true
+shlex.workspace = true
 smol.workspace = true
 streaming_diff.workspace = true
 task.workspace = true
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -27,7 +27,7 @@ use util::rel_path::RelPath;
 use workspace::Workspace;

 use crate::AgentPanel;
-use crate::acp::message_editor::MessageEditor;
+use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::context_picker::file_context_picker::{FileMatch, search_files};
 use crate::context_picker::rules_context_picker::{RulesContextEntry, search_rules};
 use crate::context_picker::symbol_context_picker::SymbolMatch;
@@ -759,13 +759,13 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                                let editor = editor.clone();
                                                move |cx| {
                                                    editor
-                                                        .update(cx, |editor, cx| {
+                                                        .update(cx, |_editor, cx| {
                                                            match intent {
                                                                CompletionIntent::Complete
                                                                | CompletionIntent::CompleteWithInsert
                                                                | CompletionIntent::CompleteWithReplace => {
                                                                    if !is_missing_argument {
-                                                                        editor.send(cx);
+                                                                        cx.emit(MessageEditorEvent::Send);
                                                                    }
                                                                }
                                                                CompletionIntent::Compose => {}
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -203,7 +203,7 @@ impl EntryViewState {
        self.entries.drain(range);
    }

-    pub fn agent_ui_font_size_changed(&mut self, cx: &mut App) {
+    pub fn agent_font_size_changed(&mut self, cx: &mut App) {
        for entry in self.entries.iter() {
            match entry {
                Entry::UserMessage { .. } | Entry::AssistantMessage { .. } => {}
@@ -387,7 +387,7 @@ fn diff_editor_text_style_refinement(cx: &mut App) -> TextStyleRefinement {
        font_size: Some(
            TextSize::Small
                .rems(cx)
-                .to_pixels(ThemeSettings::get_global(cx).agent_ui_font_size(cx))
+                .to_pixels(ThemeSettings::get_global(cx).agent_font_size(cx))
                .into(),
        ),
        ..Default::default()
@@ -414,6 +414,7 @@ mod tests {
    use project::Project;
    use serde_json::json;
    use settings::{Settings as _, SettingsStore};
+    use theme::ThemeSettings;
    use util::path;
    use workspace::Workspace;

@@ -543,7 +544,7 @@ mod tests {
            Project::init_settings(cx);
            AgentSettings::register(cx);
            workspace::init_settings(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
+            ThemeSettings::register(cx);
            release_channel::init(SemanticVersion::default(), cx);
            EditorSettings::register(cx);
        });
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -141,9 +141,7 @@ impl MessageEditor {

        subscriptions.push(cx.subscribe_in(&editor, window, {
            move |this, editor, event, window, cx| {
-                if let EditorEvent::Edited { .. } = event
-                    && !editor.read(cx).read_only(cx)
-                {
+                if let EditorEvent::Edited { .. } = event {
                    let snapshot = editor.update(cx, |editor, cx| {
                        let new_hints = this
                            .command_hint(editor.buffer(), cx)
@@ -292,18 +290,18 @@ impl MessageEditor {
        let snapshot = self
            .editor
            .update(cx, |editor, cx| editor.snapshot(window, cx));
-        let Some((excerpt_id, _, _)) = snapshot.buffer_snapshot().as_singleton() else {
+        let Some((excerpt_id, _, _)) = snapshot.buffer_snapshot.as_singleton() else {
            return Task::ready(());
        };
        let Some(start_anchor) = snapshot
-            .buffer_snapshot()
+            .buffer_snapshot
            .anchor_in_excerpt(*excerpt_id, start)
        else {
            return Task::ready(());
        };
        let end_anchor = snapshot
-            .buffer_snapshot()
-            .anchor_before(start_anchor.to_offset(&snapshot.buffer_snapshot()) + content_len + 1);
+            .buffer_snapshot
+            .anchor_before(start_anchor.to_offset(&snapshot.buffer_snapshot) + content_len + 1);

        let crease = if let MentionUri::File { abs_path } = &mention_uri
            && let Some(extension) = abs_path.extension()
@@ -720,7 +718,7 @@ impl MessageEditor {
                            continue;
                        };

-                        let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot());
+                        let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot);
                        if crease_range.start > ix {
                            //todo(): Custom slash command ContentBlock?
                            // let chunk = if prevent_slash_commands
@@ -825,20 +823,13 @@ impl MessageEditor {
        });
    }

-    pub fn send(&mut self, cx: &mut Context<Self>) {
+    fn send(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
        if self.is_empty(cx) {
            return;
        }
-        self.editor.update(cx, |editor, cx| {
-            editor.clear_inlay_hints(cx);
-        });
        cx.emit(MessageEditorEvent::Send)
    }

-    fn chat(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
-        self.send(cx);
-    }
-
    fn cancel(&mut self, _: &editor::actions::Cancel, _: &mut Window, cx: &mut Context<Self>) {
        cx.emit(MessageEditorEvent::Cancel)
    }
@@ -874,11 +865,11 @@ impl MessageEditor {
                self.editor.update(cx, |message_editor, cx| {
                    let snapshot = message_editor.snapshot(window, cx);
                    let (excerpt_id, _, buffer_snapshot) =
-                        snapshot.buffer_snapshot().as_singleton().unwrap();
+                        snapshot.buffer_snapshot.as_singleton().unwrap();

                    let text_anchor = buffer_snapshot.anchor_before(buffer_snapshot.len());
                    let multibuffer_anchor = snapshot
-                        .buffer_snapshot()
+                        .buffer_snapshot
                        .anchor_in_excerpt(*excerpt_id, text_anchor);
                    message_editor.edit(
                        [(
@@ -1039,7 +1030,6 @@ impl MessageEditor {
        ) else {
            return;
        };
-
        self.editor.update(cx, |message_editor, cx| {
            message_editor.edit([(cursor_anchor..cursor_anchor, completion.new_text)], cx);
        });
@@ -1297,7 +1287,7 @@ impl Render for MessageEditor {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        div()
            .key_context("MessageEditor")
-            .on_action(cx.listener(Self::chat))
+            .on_action(cx.listener(Self::send))
            .on_action(cx.listener(Self::cancel))
            .capture_action(cx.listener(Self::paste))
            .flex_1()
@@ -1309,7 +1299,7 @@ impl Render for MessageEditor {
                    font_family: settings.buffer_font.family.clone(),
                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
                    font_features: settings.buffer_font.features.clone(),
-                    font_size: settings.agent_buffer_font_size(cx).into(),
+                    font_size: settings.buffer_font_size(cx).into(),
                    line_height: relative(settings.buffer_line_height.value()),
                    ..Default::default()
                };
@@ -1560,7 +1550,7 @@ impl MentionSet {

    fn remove_invalid(&mut self, snapshot: EditorSnapshot) {
        for (crease_id, crease) in snapshot.crease_snapshot.creases() {
-            if !crease.range().start.is_valid(&snapshot.buffer_snapshot()) {
+            if !crease.range().start.is_valid(&snapshot.buffer_snapshot) {
                self.mentions.remove(&crease_id);
            }
        }
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -9,7 +9,7 @@ use agent_client_protocol::{self as acp, PromptCapabilities};
 use agent_servers::{AgentServer, AgentServerDelegate};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
-use anyhow::{Result, anyhow, bail};
+use anyhow::{Context as _, Result, anyhow, bail};
 use arrayvec::ArrayVec;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
@@ -26,7 +26,7 @@ use gpui::{
    CursorStyle, EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length,
    ListOffset, ListState, PlatformDisplay, SharedString, StyleRefinement, Subscription, Task,
    TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity, Window, WindowHandle, div,
-    ease_in_out, linear_color_stop, linear_gradient, list, point, pulsating_between,
+    ease_in_out, linear_color_stop, linear_gradient, list, point, prelude::*, pulsating_between,
 };
 use language::Buffer;

@@ -289,9 +289,8 @@ pub struct AcpThreadView {
    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
    is_loading_contents: bool,
    new_server_version_available: Option<SharedString>,
-    resume_thread_metadata: Option<DbThreadMetadata>,
    _cancel_task: Option<Task<()>>,
-    _subscriptions: [Subscription; 5],
+    _subscriptions: [Subscription; 4],
 }

 enum ThreadState {
@@ -381,17 +380,11 @@ impl AcpThreadView {
            )
        });

-        let agent_server_store = project.read(cx).agent_server_store().clone();
        let subscriptions = [
-            cx.observe_global_in::<SettingsStore>(window, Self::agent_ui_font_size_changed),
-            cx.observe_global_in::<AgentFontSize>(window, Self::agent_ui_font_size_changed),
+            cx.observe_global_in::<SettingsStore>(window, Self::agent_font_size_changed),
+            cx.observe_global_in::<AgentFontSize>(window, Self::agent_font_size_changed),
            cx.subscribe_in(&message_editor, window, Self::handle_message_editor_event),
            cx.subscribe_in(&entry_view_state, window, Self::handle_entry_view_event),
-            cx.subscribe_in(
-                &agent_server_store,
-                window,
-                Self::handle_agent_servers_updated,
-            ),
        ];

        Self {
@@ -399,14 +392,7 @@ impl AcpThreadView {
            workspace: workspace.clone(),
            project: project.clone(),
            entry_view_state,
-            thread_state: Self::initial_state(
-                agent.clone(),
-                resume_thread.clone(),
-                workspace.clone(),
-                project.clone(),
-                window,
-                cx,
-            ),
+            thread_state: Self::initial_state(agent, resume_thread, workspace, project, window, cx),
            login: None,
            message_editor,
            model_selector: None,
@@ -435,14 +421,13 @@ impl AcpThreadView {
            _cancel_task: None,
            focus_handle: cx.focus_handle(),
            new_server_version_available: None,
-            resume_thread_metadata: resume_thread,
        }
    }

    fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        self.thread_state = Self::initial_state(
            self.agent.clone(),
-            self.resume_thread_metadata.clone(),
+            None,
            self.workspace.clone(),
            self.project.clone(),
            window,
@@ -790,25 +775,6 @@ impl AcpThreadView {
        cx.notify();
    }

-    fn handle_agent_servers_updated(
-        &mut self,
-        _agent_server_store: &Entity<project::AgentServerStore>,
-        _event: &project::AgentServersUpdated,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // If we're in a LoadError state OR have a thread_error set (which can happen
-        // when agent.connect() fails during loading), retry loading the thread.
-        // This handles the case where a thread is restored before authentication completes.
-        let should_retry =
-            matches!(&self.thread_state, ThreadState::LoadError(_)) || self.thread_error.is_some();
-
-        if should_retry {
-            self.thread_error = None;
-            self.reset(window, cx);
-        }
-    }
-
    pub fn workspace(&self) -> &WeakEntity<Workspace> {
        &self.workspace
    }
@@ -1045,37 +1011,31 @@ impl AcpThreadView {
                return;
            };

-            self.message_editor
-                .update(cx, |editor, cx| editor.clear(window, cx));
-
            let connection = thread.read(cx).connection().clone();
-            let can_login = !connection.auth_methods().is_empty() || self.login.is_some();
-            // Does the agent have a specific logout command? Prefer that in case they need to reset internal state.
-            let logout_supported = text == "/logout"
-                && self
-                    .available_commands
-                    .borrow()
-                    .iter()
-                    .any(|command| command.name == "logout");
-            if can_login && !logout_supported {
-                let this = cx.weak_entity();
-                let agent = self.agent.clone();
-                window.defer(cx, |window, cx| {
-                    Self::handle_auth_required(
-                        this,
-                        AuthRequired {
-                            description: None,
-                            provider_id: None,
-                        },
-                        agent,
-                        connection,
-                        window,
-                        cx,
-                    );
-                });
-                cx.notify();
+            if !connection
+                .auth_methods()
+                .iter()
+                .any(|method| method.id.0.as_ref() == "claude-login")
+            {
                return;
-            }
+            };
+            let this = cx.weak_entity();
+            let agent = self.agent.clone();
+            window.defer(cx, |window, cx| {
+                Self::handle_auth_required(
+                    this,
+                    AuthRequired {
+                        description: None,
+                        provider_id: None,
+                    },
+                    agent,
+                    connection,
+                    window,
+                    cx,
+                );
+            });
+            cx.notify();
+            return;
        }

        self.send_impl(self.message_editor.clone(), window, cx)
@@ -1619,20 +1579,31 @@ impl AcpThreadView {
            return Task::ready(Ok(()));
        };
        let project = workspace.read(cx).project().clone();
+        let cwd = project.read(cx).first_project_directory(cx);
+        let shell = project.read(cx).terminal_settings(&cwd, cx).shell.clone();

        window.spawn(cx, async move |cx| {
            let mut task = login.clone();
-            task.shell = task::Shell::WithArguments {
-                program: task.command.take().expect("login command should be set"),
-                args: std::mem::take(&mut task.args),
-                title_override: None
-            };
+            task.command = task
+                .command
+                .map(|command| anyhow::Ok(shlex::try_quote(&command)?.to_string()))
+                .transpose()?;
+            task.args = task
+                .args
+                .iter()
+                .map(|arg| {
+                    Ok(shlex::try_quote(arg)
+                        .context("Failed to quote argument")?
+                        .to_string())
+                })
+                .collect::<Result<Vec<_>>>()?;
            task.full_label = task.label.clone();
            task.id = task::TaskId(format!("external-agent-{}-login", task.label));
            task.command_label = task.label.clone();
            task.use_new_terminal = true;
            task.allow_concurrent_runs = true;
            task.hide = task::HideStrategy::Always;
+            task.shell = shell;

            let terminal = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
                terminal_panel.spawn_task(&task, window, cx)
@@ -2731,7 +2702,7 @@ impl AcpThreadView {
        let output_line_count = output.map(|output| output.content_line_count).unwrap_or(0);

        let command_failed = command_finished
-            && output.is_some_and(|o| o.exit_status.is_some_and(|status| !status.success()));
+            && output.is_some_and(|o| o.exit_status.is_none_or(|status| !status.success()));

        let time_elapsed = if let Some(output) = output {
            output.ended_at.duration_since(started_at)
@@ -2754,7 +2725,7 @@ impl AcpThreadView {

        let working_dir = working_dir
            .as_ref()
-            .map(|path| path.display().to_string())
+            .map(|path| format!("{}", path.display()))
            .unwrap_or_else(|| "current directory".to_string());

        let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
@@ -3286,12 +3257,6 @@ impl AcpThreadView {
                                                this.style(ButtonStyle::Outlined)
                                            }
                                        })
-                                        .when_some(
-                                            method.description.clone(),
-                                            |this, description| {
-                                                this.tooltip(Tooltip::text(description))
-                                            },
-                                        )
                                        .on_click({
                                            cx.listener(move |this, _, window, cx| {
                                                telemetry::event!(
@@ -3398,12 +3363,6 @@ impl AcpThreadView {
            .into_any_element()
    }

-    fn activity_bar_bg(&self, cx: &Context<Self>) -> Hsla {
-        let editor_bg_color = cx.theme().colors().editor_background;
-        let active_color = cx.theme().colors().element_selected;
-        editor_bg_color.blend(active_color.opacity(0.3))
-    }
-
    fn render_activity_bar(
        &self,
        thread_entity: &Entity<AcpThread>,
@@ -3419,6 +3378,10 @@ impl AcpThreadView {
            return None;
        }

+        let editor_bg_color = cx.theme().colors().editor_background;
+        let active_color = cx.theme().colors().element_selected;
+        let bg_edit_files_disclosure = editor_bg_color.blend(active_color.opacity(0.3));
+
        // Temporarily always enable ACP edit controls. This is temporary, to lessen the
        // impact of a nasty bug that causes them to sometimes be disabled when they shouldn't
        // be, which blocks you from being able to accept or reject edits. This switches the
@@ -3429,7 +3392,7 @@ impl AcpThreadView {
        v_flex()
            .mt_1()
            .mx_2()
-            .bg(self.activity_bar_bg(cx))
+            .bg(bg_edit_files_disclosure)
            .border_1()
            .border_b_0()
            .border_color(cx.theme().colors().border)
@@ -3470,33 +3433,27 @@ impl AcpThreadView {
            .into()
    }

-    fn render_plan_summary(
-        &self,
-        plan: &Plan,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
+    fn render_plan_summary(&self, plan: &Plan, window: &mut Window, cx: &Context<Self>) -> Div {
        let stats = plan.stats();

        let title = if let Some(entry) = stats.in_progress_entry
            && !self.plan_expanded
        {
            h_flex()
-                .cursor_default()
-                .relative()
                .w_full()
+                .cursor_default()
                .gap_1()
-                .truncate()
+                .text_xs()
+                .text_color(cx.theme().colors().text_muted)
+                .justify_between()
                .child(
-                    Label::new("Current:")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    div()
-                        .text_xs()
-                        .text_color(cx.theme().colors().text_muted)
-                        .line_clamp(1)
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Label::new("Current:")
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
                        .child(MarkdownElement::new(
                            entry.content.clone(),
                            plan_label_markdown_style(&entry.status, window, cx),
@@ -3504,23 +3461,10 @@ impl AcpThreadView {
                )
                .when(stats.pending > 0, |this| {
                    this.child(
-                        h_flex()
-                            .absolute()
-                            .top_0()
-                            .right_0()
-                            .h_full()
-                            .child(div().min_w_8().h_full().bg(linear_gradient(
-                                90.,
-                                linear_color_stop(self.activity_bar_bg(cx), 1.),
-                                linear_color_stop(self.activity_bar_bg(cx).opacity(0.2), 0.),
-                            )))
-                            .child(
-                                div().pr_0p5().bg(self.activity_bar_bg(cx)).child(
-                                    Label::new(format!("{} left", stats.pending))
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                ),
-                            ),
+                        Label::new(format!("{} left", stats.pending))
+                            .size(LabelSize::Small)
+                            .color(Color::Muted)
+                            .mr_1(),
                    )
                })
        } else {
@@ -3550,19 +3494,23 @@ impl AcpThreadView {
        };

        h_flex()
-            .id("plan_summary")
            .p_1()
-            .w_full()
-            .gap_1()
+            .justify_between()
            .when(self.plan_expanded, |this| {
                this.border_b_1().border_color(cx.theme().colors().border)
            })
-            .child(Disclosure::new("plan_disclosure", self.plan_expanded))
-            .child(title)
-            .on_click(cx.listener(|this, _, _, cx| {
-                this.plan_expanded = !this.plan_expanded;
-                cx.notify();
-            }))
+            .child(
+                h_flex()
+                    .id("plan_summary")
+                    .w_full()
+                    .gap_1()
+                    .child(Disclosure::new("plan_disclosure", self.plan_expanded))
+                    .child(title)
+                    .on_click(cx.listener(|this, _, _, cx| {
+                        this.plan_expanded = !this.plan_expanded;
+                        cx.notify();
+                    })),
+            )
    }

    fn render_plan_entries(&self, plan: &Plan, window: &mut Window, cx: &Context<Self>) -> Div {
@@ -3764,10 +3712,13 @@ impl AcpThreadView {
                        None
                    } else {
                        Some(
-                            Label::new(format!("{}{separator}", parent.display(path_style)))
-                                .color(Color::Muted)
-                                .size(LabelSize::XSmall)
-                                .buffer_font(cx),
+                            Label::new(format!(
+                                "{separator}{}{separator}",
+                                parent.display(path_style)
+                            ))
+                            .color(Color::Muted)
+                            .size(LabelSize::XSmall)
+                            .buffer_font(cx),
                        )
                    }
                });
@@ -3811,7 +3762,7 @@ impl AcpThreadView {
                            .id(("file-name", index))
                            .pr_8()
                            .gap_1p5()
-                            .w_full()
+                            .max_w_full()
                            .overflow_x_scroll()
                            .child(file_icon)
                            .child(h_flex().gap_0p5().children(file_name).children(file_path))
@@ -4963,9 +4914,9 @@ impl AcpThreadView {
        )
    }

-    fn agent_ui_font_size_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+    fn agent_font_size_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
        self.entry_view_state.update(cx, |entry_view_state, cx| {
-            entry_view_state.agent_ui_font_size_changed(cx);
+            entry_view_state.agent_font_size_changed(cx);
        });
    }

@@ -4981,12 +4932,10 @@ impl AcpThreadView {
        })
    }

-    /// Inserts the selected text into the message editor or the message being
-    /// edited, if any.
    pub(crate) fn insert_selections(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.active_editor(cx).update(cx, |editor, cx| {
-            editor.insert_selections(window, cx);
-        });
+        self.message_editor.update(cx, |message_editor, cx| {
+            message_editor.insert_selections(window, cx);
+        })
    }

    fn render_thread_retry_status_callout(
@@ -5397,23 +5346,6 @@ impl AcpThreadView {
        };
        task.detach_and_log_err(cx);
    }
-
-    /// Returns the currently active editor, either for a message that is being
-    /// edited or the editor for a new message.
-    fn active_editor(&self, cx: &App) -> Entity<MessageEditor> {
-        if let Some(index) = self.editing_message
-            && let Some(editor) = self
-                .entry_view_state
-                .read(cx)
-                .entry(index)
-                .and_then(|e| e.message_editor())
-                .cloned()
-        {
-            editor
-        } else {
-            self.message_editor.clone()
-        }
-    }
 }

 fn loading_contents_spinner(size: IconSize) -> AnyElement {
@@ -5428,7 +5360,7 @@ impl Focusable for AcpThreadView {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        match self.thread_state {
            ThreadState::Loading { .. } | ThreadState::Ready { .. } => {
-                self.active_editor(cx).focus_handle(cx)
+                self.message_editor.focus_handle(cx)
            }
            ThreadState::LoadError(_) | ThreadState::Unauthenticated { .. } => {
                self.focus_handle.clone()
@@ -5614,23 +5546,23 @@ fn default_markdown_style(
        }),
        code_block: StyleRefinement {
            padding: EdgesRefinement {
-                top: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
-                left: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
-                right: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
-                bottom: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
+                top: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
+                left: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
+                right: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
+                bottom: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
            },
            margin: EdgesRefinement {
-                top: Some(Length::Definite(px(8.).into())),
-                left: Some(Length::Definite(px(0.).into())),
-                right: Some(Length::Definite(px(0.).into())),
-                bottom: Some(Length::Definite(px(12.).into())),
+                top: Some(Length::Definite(Pixels(8.).into())),
+                left: Some(Length::Definite(Pixels(0.).into())),
+                right: Some(Length::Definite(Pixels(0.).into())),
+                bottom: Some(Length::Definite(Pixels(12.).into())),
            },
            border_style: Some(BorderStyle::Solid),
            border_widths: EdgesRefinement {
-                top: Some(AbsoluteLength::Pixels(px(1.))),
-                left: Some(AbsoluteLength::Pixels(px(1.))),
-                right: Some(AbsoluteLength::Pixels(px(1.))),
-                bottom: Some(AbsoluteLength::Pixels(px(1.))),
+                top: Some(AbsoluteLength::Pixels(Pixels(1.))),
+                left: Some(AbsoluteLength::Pixels(Pixels(1.))),
+                right: Some(AbsoluteLength::Pixels(Pixels(1.))),
+                bottom: Some(AbsoluteLength::Pixels(Pixels(1.))),
            },
            border_color: Some(colors.border_variant),
            background: Some(colors.editor_background.into()),
@@ -6115,7 +6047,7 @@ pub(crate) mod tests {
            Project::init_settings(cx);
            AgentSettings::register(cx);
            workspace::init_settings(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
+            ThemeSettings::register(cx);
            release_channel::init(SemanticVersion::default(), cx);
            EditorSettings::register(cx);
            prompt_store::init(cx)
@@ -6689,146 +6621,4 @@ pub(crate) mod tests {
            )
        });
    }
-
-    #[gpui::test]
-    async fn test_message_editing_insert_selections(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk {
-            content: acp::ContentBlock::Text(acp::TextContent {
-                text: "Response".into(),
-                annotations: None,
-                meta: None,
-            }),
-        }]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx)
-        });
-        thread_view.update_in(cx, |thread_view, window, cx| thread_view.send(window, cx));
-        cx.run_until_parked();
-
-        let user_message_editor = thread_view.read_with(cx, |thread_view, cx| {
-            thread_view
-                .entry_view_state
-                .read(cx)
-                .entry(0)
-                .expect("Should have at least one entry")
-                .message_editor()
-                .expect("Should have message editor")
-                .clone()
-        });
-
-        cx.focus(&user_message_editor);
-        thread_view.read_with(cx, |thread_view, _cx| {
-            assert_eq!(thread_view.editing_message, Some(0));
-        });
-
-        // Ensure to edit the focused message before proceeding otherwise, since
-        // its content is not different from what was sent, focus will be lost.
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit with ", window, cx)
-        });
-
-        // Create a simple buffer with some text so we can create a selection
-        // that will then be added to the message being edited.
-        let (workspace, project) = thread_view.read_with(cx, |thread_view, _cx| {
-            (thread_view.workspace.clone(), thread_view.project.clone())
-        });
-        let buffer = project.update(cx, |project, cx| {
-            project.create_local_buffer("let a = 10 + 10;", None, false, cx)
-        });
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                let editor = cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_buffer(buffer.clone(), Some(project.clone()), window, cx);
-
-                    editor.change_selections(Default::default(), window, cx, |selections| {
-                        selections.select_ranges([8..15]);
-                    });
-
-                    editor
-                });
-                workspace.add_item_to_active_pane(Box::new(editor), None, false, window, cx);
-            })
-            .unwrap();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            assert_eq!(thread_view.editing_message, Some(0));
-            thread_view.insert_selections(window, cx);
-        });
-
-        user_message_editor.read_with(cx, |editor, cx| {
-            let text = editor.editor().read(cx).text(cx);
-            let expected_text = String::from("Original message to edit with selection ");
-
-            assert_eq!(text, expected_text);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_insert_selections(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk {
-            content: acp::ContentBlock::Text(acp::TextContent {
-                text: "Response".into(),
-                annotations: None,
-                meta: None,
-            }),
-        }]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Can you review this snippet ", window, cx)
-        });
-
-        // Create a simple buffer with some text so we can create a selection
-        // that will then be added to the message being edited.
-        let (workspace, project) = thread_view.read_with(cx, |thread_view, _cx| {
-            (thread_view.workspace.clone(), thread_view.project.clone())
-        });
-        let buffer = project.update(cx, |project, cx| {
-            project.create_local_buffer("let a = 10 + 10;", None, false, cx)
-        });
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                let editor = cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_buffer(buffer.clone(), Some(project.clone()), window, cx);
-
-                    editor.change_selections(Default::default(), window, cx, |selections| {
-                        selections.select_ranges([8..15]);
-                    });
-
-                    editor
-                });
-                workspace.add_item_to_active_pane(Box::new(editor), None, false, window, cx);
-            })
-            .unwrap();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            assert_eq!(thread_view.editing_message, None);
-            thread_view.insert_selections(window, cx);
-        });
-
-        thread_view.read_with(cx, |thread_view, cx| {
-            let text = thread_view.message_editor.read(cx).text(cx);
-            let expected_txt = String::from("Can you review this snippet selection ");
-
-            assert_eq!(text, expected_txt);
-        })
-    }
 }
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -6,6 +6,7 @@ mod tool_picker;

 use std::{ops::Range, sync::Arc};

+use agent_settings::AgentSettings;
 use anyhow::Result;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use cloud_llm_client::{Plan, PlanV1, PlanV2};
@@ -25,13 +26,13 @@ use language_model::{
 };
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
-    agent_server_store::{AgentServerStore, CLAUDE_CODE_NAME, CODEX_NAME, GEMINI_NAME},
+    agent_server_store::{AgentServerStore, CLAUDE_CODE_NAME, GEMINI_NAME},
    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
 };
-use settings::{SettingsStore, update_settings_file};
+use settings::{Settings, SettingsStore, update_settings_file};
 use ui::{
    Chip, CommonAnimationExt, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex,
-    Indicator, PopoverMenu, Switch, SwitchColor, Tooltip, WithScrollbar, prelude::*,
+    Indicator, PopoverMenu, Switch, SwitchColor, SwitchField, Tooltip, WithScrollbar, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{Workspace, create_and_open_local_file};
@@ -401,6 +402,101 @@ impl AgentConfiguration {
            )
    }

+    fn render_command_permission(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let always_allow_tool_actions = AgentSettings::get_global(cx).always_allow_tool_actions;
+        let fs = self.fs.clone();
+
+        SwitchField::new(
+            "always-allow-tool-actions-switch",
+            "Allow running commands without asking for confirmation",
+            Some(
+                "The agent can perform potentially destructive actions without asking for your confirmation.".into(),
+            ),
+            always_allow_tool_actions,
+            move |state, _window, cx| {
+                let allow = state == &ToggleState::Selected;
+                update_settings_file(fs.clone(), cx, move |settings, _| {
+                    settings.agent.get_or_insert_default().set_always_allow_tool_actions(allow);
+                });
+            },
+        )
+    }
+
+    fn render_single_file_review(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let single_file_review = AgentSettings::get_global(cx).single_file_review;
+        let fs = self.fs.clone();
+
+        SwitchField::new(
+            "single-file-review",
+            "Enable single-file agent reviews",
+            Some("Agent edits are also displayed in single-file editors for review.".into()),
+            single_file_review,
+            move |state, _window, cx| {
+                let allow = state == &ToggleState::Selected;
+                update_settings_file(fs.clone(), cx, move |settings, _| {
+                    settings
+                        .agent
+                        .get_or_insert_default()
+                        .set_single_file_review(allow);
+                });
+            },
+        )
+    }
+
+    fn render_sound_notification(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let play_sound_when_agent_done = AgentSettings::get_global(cx).play_sound_when_agent_done;
+        let fs = self.fs.clone();
+
+        SwitchField::new(
+            "sound-notification",
+            "Play sound when finished generating",
+            Some(
+                "Hear a notification sound when the agent is done generating changes or needs your input.".into(),
+            ),
+            play_sound_when_agent_done,
+            move |state, _window, cx| {
+                let allow = state == &ToggleState::Selected;
+                update_settings_file(fs.clone(), cx, move |settings, _| {
+                    settings.agent.get_or_insert_default().set_play_sound_when_agent_done(allow);
+                });
+            },
+        )
+    }
+
+    fn render_modifier_to_send(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let use_modifier_to_send = AgentSettings::get_global(cx).use_modifier_to_send;
+        let fs = self.fs.clone();
+
+        SwitchField::new(
+            "modifier-send",
+            "Use modifier to submit a message",
+            Some(
+                "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux or Windows) required to send messages.".into(),
+            ),
+            use_modifier_to_send,
+            move |state, _window, cx| {
+                let allow = state == &ToggleState::Selected;
+                update_settings_file(fs.clone(), cx, move |settings, _| {
+                    settings.agent.get_or_insert_default().set_use_modifier_to_send(allow);
+                });
+            },
+        )
+    }
+
+    fn render_general_settings_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .p(DynamicSpacing::Base16.rems(cx))
+            .pr(DynamicSpacing::Base20.rems(cx))
+            .gap_2p5()
+            .border_b_1()
+            .border_color(cx.theme().colors().border)
+            .child(Headline::new("General Settings"))
+            .child(self.render_command_permission(cx))
+            .child(self.render_single_file_review(cx))
+            .child(self.render_sound_notification(cx))
+            .child(self.render_modifier_to_send(cx))
+    }
+
    fn render_zed_plan_info(&self, plan: Option<Plan>, cx: &mut Context<Self>) -> impl IntoElement {
        if let Some(plan) = plan {
            let free_chip_bg = cx
@@ -918,9 +1014,7 @@ impl AgentConfiguration {
            .agent_server_store
            .read(cx)
            .external_agents()
-            .filter(|name| {
-                name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME && name.0 != CODEX_NAME
-            })
+            .filter(|name| name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME)
            .cloned()
            .collect::<Vec<_>>();

@@ -983,20 +1077,15 @@ impl AgentConfiguration {
                                .color(Color::Muted),
                            ),
                    )
-                    .child(self.render_agent_server(
-                        IconName::AiClaude,
-                        "Claude Code",
-                    ))
-                    .child(Divider::horizontal().color(DividerColor::BorderFaded))
-                    .child(self.render_agent_server(
-                        IconName::AiOpenAi,
-                        "Codex",
-                    ))
-                    .child(Divider::horizontal().color(DividerColor::BorderFaded))
                    .child(self.render_agent_server(
                        IconName::AiGemini,
                        "Gemini CLI",
                    ))
+                    .child(Divider::horizontal().color(DividerColor::BorderFaded))
+                    .child(self.render_agent_server(
+                        IconName::AiClaude,
+                        "Claude Code",
+                    ))
                    .map(|mut parent| {
                        for agent in user_defined_agents {
                            parent = parent.child(Divider::horizontal().color(DividerColor::BorderFaded))
@@ -1045,6 +1134,7 @@ impl Render for AgentConfiguration {
                            .track_scroll(&self.scroll_handle)
                            .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_configuration/add_llm_provider_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
@@ -619,10 +619,10 @@ mod tests {
        cx.update(|_window, cx| {
            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
                registry.register_provider(
-                    Arc::new(FakeLanguageModelProvider::new(
+                    FakeLanguageModelProvider::new(
                        LanguageModelProviderId::new("someprovider"),
                        LanguageModelProviderName::new("Some Provider"),
-                    )),
+                    ),
                    cx,
                );
            });
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -317,8 +317,6 @@ impl ManageProfilesModal {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> impl IntoElement + use<> {
-        let is_focused = profile.navigation.focus_handle.contains_focused(window, cx);
-
        div()
            .id(SharedString::from(format!("profile-{}", profile.id)))
            .track_focus(&profile.navigation.focus_handle)
@@ -330,27 +328,25 @@ impl ManageProfilesModal {
            })
            .child(
                ListItem::new(SharedString::from(format!("profile-{}", profile.id)))
-                    .toggle_state(is_focused)
+                    .toggle_state(profile.navigation.focus_handle.contains_focused(window, cx))
                    .inset(true)
                    .spacing(ListItemSpacing::Sparse)
                    .child(Label::new(profile.name.clone()))
-                    .when(is_focused, |this| {
-                        this.end_slot(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Label::new("Customize")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                )
-                                .children(KeyBinding::for_action_in(
-                                    &menu::Confirm,
-                                    &self.focus_handle,
-                                    window,
-                                    cx,
-                                )),
-                        )
-                    })
+                    .end_slot(
+                        h_flex()
+                            .gap_1()
+                            .child(
+                                Label::new("Customize")
+                                    .size(LabelSize::Small)
+                                    .color(Color::Muted),
+                            )
+                            .children(KeyBinding::for_action_in(
+                                &menu::Confirm,
+                                &self.focus_handle,
+                                window,
+                                cx,
+                            )),
+                    )
                    .on_click({
                        let profile_id = profile.id.clone();
                        cx.listener(move |this, _, window, cx| {
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -562,6 +562,10 @@ impl Item for AgentDiffPane {
        self.editor.for_each_project_item(cx, f)
    }

+    fn is_singleton(&self, _: &App) -> bool {
+        false
+    }
+
    fn set_nav_history(
        &mut self,
        nav_history: ItemNavHistory,
@@ -846,7 +850,7 @@ fn render_diff_hunk_controls(
                                editor.update(cx, |editor, cx| {
                                    let snapshot = editor.snapshot(window, cx);
                                    let position =
-                                        hunk_range.end.to_point(&snapshot.buffer_snapshot());
+                                        hunk_range.end.to_point(&snapshot.buffer_snapshot);
                                    editor.go_to_hunk_before_or_after_position(
                                        &snapshot,
                                        position,
@@ -882,7 +886,7 @@ fn render_diff_hunk_controls(
                                editor.update(cx, |editor, cx| {
                                    let snapshot = editor.snapshot(window, cx);
                                    let point =
-                                        hunk_range.start.to_point(&snapshot.buffer_snapshot());
+                                        hunk_range.start.to_point(&snapshot.buffer_snapshot);
                                    editor.go_to_hunk_before_or_after_position(
                                        &snapshot,
                                        point,
@@ -1814,6 +1818,7 @@ mod tests {
    use serde_json::json;
    use settings::{Settings, SettingsStore};
    use std::{path::Path, rc::Rc};
+    use theme::ThemeSettings;
    use util::path;

    #[gpui::test]
@@ -1826,7 +1831,7 @@ mod tests {
            AgentSettings::register(cx);
            prompt_store::init(cx);
            workspace::init_settings(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
+            ThemeSettings::register(cx);
            EditorSettings::register(cx);
            language_model::init_settings(cx);
        });
@@ -1978,7 +1983,7 @@ mod tests {
            AgentSettings::register(cx);
            prompt_store::init(cx);
            workspace::init_settings(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
+            ThemeSettings::register(cx);
            EditorSettings::register(cx);
            language_model::init_settings(cx);
            workspace::register_project_item::<Editor>(cx);
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -7,7 +7,7 @@ use acp_thread::AcpThread;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use project::agent_server_store::{
-    AgentServerCommand, AllAgentServersSettings, CLAUDE_CODE_NAME, CODEX_NAME, GEMINI_NAME,
+    AgentServerCommand, AllAgentServersSettings, CLAUDE_CODE_NAME, GEMINI_NAME,
 };
 use serde::{Deserialize, Serialize};
 use settings::{
@@ -53,7 +53,7 @@ use gpui::{
 };
 use language::LanguageRegistry;
 use language_model::{ConfigurationError, LanguageModelRegistry};
-use project::{Project, ProjectPath, Worktree};
+use project::{DisableAiSettings, Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
 use rules_library::{RulesLibrary, open_rules_library};
 use search::{BufferSearchBar, buffer_search};
@@ -216,7 +216,6 @@ pub enum AgentType {
    TextThread,
    Gemini,
    ClaudeCode,
-    Codex,
    NativeAgent,
    Custom {
        name: SharedString,
@@ -231,7 +230,6 @@ impl AgentType {
            Self::NativeAgent => "Agent 2".into(),
            Self::Gemini => "Gemini CLI".into(),
            Self::ClaudeCode => "Claude Code".into(),
-            Self::Codex => "Codex".into(),
            Self::Custom { name, .. } => name.into(),
        }
    }
@@ -241,7 +239,6 @@ impl AgentType {
            Self::Zed | Self::NativeAgent | Self::TextThread => None,
            Self::Gemini => Some(IconName::AiGemini),
            Self::ClaudeCode => Some(IconName::AiClaude),
-            Self::Codex => Some(IconName::AiOpenAi),
            Self::Custom { .. } => Some(IconName::Terminal),
        }
    }
@@ -252,7 +249,6 @@ impl From<ExternalAgent> for AgentType {
        match value {
            ExternalAgent::Gemini => Self::Gemini,
            ExternalAgent::ClaudeCode => Self::ClaudeCode,
-            ExternalAgent::Codex => Self::Codex,
            ExternalAgent::Custom { name, command } => Self::Custom { name, command },
            ExternalAgent::NativeAgent => Self::NativeAgent,
        }
@@ -518,7 +514,6 @@ impl AgentPanel {
                        cx,
                    )
                });
-
                panel.as_mut(cx).loading = true;
                if let Some(serialized_panel) = serialized_panel {
                    panel.update(cx, |panel, cx| {
@@ -670,6 +665,43 @@ impl AgentPanel {
            )
        });

+        let mut old_disable_ai = false;
+        cx.observe_global_in::<SettingsStore>(window, move |panel, window, cx| {
+            let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
+            if old_disable_ai != disable_ai {
+                let agent_panel_id = cx.entity_id();
+                let agent_panel_visible = panel
+                    .workspace
+                    .update(cx, |workspace, cx| {
+                        let agent_dock_position = panel.position(window, cx);
+                        let agent_dock = workspace.dock_at_position(agent_dock_position);
+                        let agent_panel_focused = agent_dock
+                            .read(cx)
+                            .active_panel()
+                            .is_some_and(|panel| panel.panel_id() == agent_panel_id);
+
+                        let active_panel_visible = agent_dock
+                            .read(cx)
+                            .visible_panel()
+                            .is_some_and(|panel| panel.panel_id() == agent_panel_id);
+
+                        if agent_panel_focused {
+                            cx.dispatch_action(&ToggleFocus);
+                        }
+
+                        active_panel_visible
+                    })
+                    .unwrap_or_default();
+
+                if agent_panel_visible {
+                    cx.emit(PanelEvent::Close);
+                }
+
+                old_disable_ai = disable_ai;
+            }
+        })
+        .detach();
+
        Self {
            active_view,
            workspace,
@@ -1071,15 +1103,15 @@ impl AgentPanel {
            WhichFontSize::AgentFont => {
                if persist {
                    update_settings_file(self.fs.clone(), cx, move |settings, cx| {
-                        let agent_ui_font_size =
-                            ThemeSettings::get_global(cx).agent_ui_font_size(cx) + delta;
+                        let agent_font_size =
+                            ThemeSettings::get_global(cx).agent_font_size(cx) + delta;
                        let _ = settings
                            .theme
-                            .agent_ui_font_size
-                            .insert(theme::clamp_font_size(agent_ui_font_size).into());
+                            .agent_font_size
+                            .insert(theme::clamp_font_size(agent_font_size).into());
                    });
                } else {
-                    theme::adjust_agent_ui_font_size(cx, |size| size + delta);
+                    theme::adjust_agent_font_size(cx, |size| size + delta);
                }
            }
            WhichFontSize::BufferFont => {
@@ -1099,10 +1131,10 @@ impl AgentPanel {
    ) {
        if action.persist {
            update_settings_file(self.fs.clone(), cx, move |settings, _| {
-                settings.theme.agent_ui_font_size = None;
+                settings.theme.agent_font_size = None;
            });
        } else {
-            theme::reset_agent_ui_font_size(cx);
+            theme::reset_agent_font_size(cx);
        }
    }

@@ -1395,11 +1427,6 @@ impl AgentPanel {
                    cx,
                )
            }
-            AgentType::Codex => {
-                self.selected_agent = AgentType::Codex;
-                self.serialize(cx);
-                self.external_thread(Some(crate::ExternalAgent::Codex), None, None, window, cx)
-            }
            AgentType::Custom { name, command } => self.external_thread(
                Some(crate::ExternalAgent::Custom { name, command }),
                None,
@@ -1912,58 +1939,6 @@ impl AgentPanel {
                            )
                            .separator()
                            .header("External Agents")
-                            .item(
-                                ContextMenuEntry::new("New Claude Code Thread")
-                                    .icon(IconName::AiClaude)
-                                    .disabled(is_via_collab)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.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.new_agent_thread(
-                                                                AgentType::ClaudeCode,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
-                            .item(
-                                ContextMenuEntry::new("New Codex Thread")
-                                    .icon(IconName::AiOpenAi)
-                                    .disabled(is_via_collab)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.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.new_agent_thread(
-                                                                AgentType::Codex,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
                            .item(
                                ContextMenuEntry::new("New Gemini CLI Thread")
                                    .icon(IconName::AiGemini)
@@ -1990,12 +1965,38 @@ impl AgentPanel {
                                        }
                                    }),
                            )
+                            .item(
+                                ContextMenuEntry::new("New Claude Code Thread")
+                                    .icon(IconName::AiClaude)
+                                    .disabled(is_via_collab)
+                                    .icon_color(Color::Muted)
+                                    .handler({
+                                        let workspace = workspace.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.new_agent_thread(
+                                                                AgentType::ClaudeCode,
+                                                                window,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                        }
+                                    }),
+                            )
                            .map(|mut menu| {
                                let agent_names = agent_server_store
                                    .read(cx)
                                    .external_agents()
                                    .filter(|name| {
-                                        name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME && name.0 != CODEX_NAME
+                                        name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME
                                    })
                                    .cloned()
                                    .collect::<Vec<_>>();
@@ -2531,7 +2532,7 @@ impl Render for AgentPanel {

        match self.active_view.which_font_size_used() {
            WhichFontSize::AgentFont => {
-                WithRemSize::new(ThemeSettings::get_global(cx).agent_ui_font_size(cx))
+                WithRemSize::new(ThemeSettings::get_global(cx).agent_font_size(cx))
                    .size_full()
                    .child(content)
                    .into_any()
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -167,7 +167,6 @@ enum ExternalAgent {
    #[default]
    Gemini,
    ClaudeCode,
-    Codex,
    NativeAgent,
    Custom {
        name: SharedString,
@@ -189,7 +188,6 @@ impl ExternalAgent {
            Self::NativeAgent => "zed",
            Self::Gemini => "gemini-cli",
            Self::ClaudeCode => "claude-code",
-            Self::Codex => "codex",
            Self::Custom { .. } => "custom",
        }
    }
@@ -202,7 +200,6 @@ impl ExternalAgent {
        match self {
            Self::Gemini => Rc::new(agent_servers::Gemini),
            Self::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
-            Self::Codex => Rc::new(agent_servers::Codex),
            Self::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
            Self::Custom { name, command: _ } => {
                Rc::new(agent_servers::CustomAgentServer::new(name.clone()))
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -18,9 +18,7 @@ use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::{HashMap, HashSet, VecDeque, hash_map};
-use editor::RowExt;
 use editor::SelectionEffects;
-use editor::scroll::ScrollOffset;
 use editor::{
    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
    MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
@@ -382,7 +380,7 @@ impl InlineAssistant {
        if let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) {
            for assist_id in &editor_assists.assist_ids {
                let assist = &self.assists[assist_id];
-                let range = assist.range.to_point(&snapshot.buffer_snapshot());
+                let range = assist.range.to_point(&snapshot.buffer_snapshot);
                if range.start.row <= newest_selection.start.row
                    && newest_selection.end.row <= range.end.row
                {
@@ -402,16 +400,16 @@ impl InlineAssistant {
                    selection.end.row -= 1;
                }
                selection.end.column = snapshot
-                    .buffer_snapshot()
+                    .buffer_snapshot
                    .line_len(MultiBufferRow(selection.end.row));
            } else if let Some(fold) =
                snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
            {
                selection.start = fold.range().start;
                selection.end = fold.range().end;
-                if MultiBufferRow(selection.end.row) < snapshot.buffer_snapshot().max_row() {
+                if MultiBufferRow(selection.end.row) < snapshot.buffer_snapshot.max_row() {
                    let chars = snapshot
-                        .buffer_snapshot()
+                        .buffer_snapshot
                        .chars_at(Point::new(selection.end.row + 1, 0));

                    for c in chars {
@@ -427,7 +425,7 @@ impl InlineAssistant {
                        {
                            selection.end.row += 1;
                            selection.end.column = snapshot
-                                .buffer_snapshot()
+                                .buffer_snapshot
                                .line_len(MultiBufferRow(selection.end.row));
                        }
                    }
@@ -447,7 +445,7 @@ impl InlineAssistant {
            }
            selections.push(selection);
        }
-        let snapshot = &snapshot.buffer_snapshot();
+        let snapshot = &snapshot.buffer_snapshot;
        let newest_selection = newest_selection.unwrap();

        let mut codegen_ranges = Vec::new();
@@ -746,7 +744,7 @@ impl InlineAssistant {
                let scroll_bottom = scroll_top + editor.visible_line_count().unwrap_or(0.);
                editor_assists.scroll_lock = editor
                    .row_for_block(decorations.prompt_block_id, cx)
-                    .map(|row| row.as_f64())
+                    .map(|row| row.0 as f32)
                    .filter(|prompt_row| (scroll_top..scroll_bottom).contains(&prompt_row))
                    .map(|prompt_row| InlineAssistScrollLock {
                        assist_id,
@@ -912,9 +910,7 @@ impl InlineAssistant {

        editor.update(cx, |editor, cx| {
            let scroll_position = editor.scroll_position(cx);
-            let target_scroll_top = editor
-                .row_for_block(decorations.prompt_block_id, cx)?
-                .as_f64()
+            let target_scroll_top = editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f32
                - scroll_lock.distance_from_top;
            if target_scroll_top != scroll_position.y {
                editor.set_scroll_position(point(scroll_position.x, target_scroll_top), window, cx);
@@ -963,9 +959,8 @@ impl InlineAssistant {
                    if let Some(decorations) = assist.decorations.as_ref() {
                        let distance_from_top = editor.update(cx, |editor, cx| {
                            let scroll_top = editor.scroll_position(cx).y;
-                            let prompt_row = editor
-                                .row_for_block(decorations.prompt_block_id, cx)?
-                                .0 as ScrollOffset;
+                            let prompt_row =
+                                editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f32;
                            Some(prompt_row - scroll_top)
                        });

@@ -1197,8 +1192,8 @@ impl InlineAssistant {
            let mut scroll_target_range = None;
            if let Some(decorations) = assist.decorations.as_ref() {
                scroll_target_range = maybe!({
-                    let top = editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f64;
-                    let bottom = editor.row_for_block(decorations.end_block_id, cx)?.0 as f64;
+                    let top = editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f32;
+                    let bottom = editor.row_for_block(decorations.end_block_id, cx)?.0 as f32;
                    Some((top, bottom))
                });
                if scroll_target_range.is_none() {
@@ -1212,15 +1207,15 @@ impl InlineAssistant {
                    .start
                    .to_display_point(&snapshot.display_snapshot)
                    .row();
-                let top = start_row.0 as ScrollOffset;
+                let top = start_row.0 as f32;
                let bottom = top + 1.0;
                (top, bottom)
            });
            let mut scroll_target_top = scroll_target_range.0;
            let mut scroll_target_bottom = scroll_target_range.1;

-            scroll_target_top -= editor.vertical_scroll_margin() as ScrollOffset;
-            scroll_target_bottom += editor.vertical_scroll_margin() as ScrollOffset;
+            scroll_target_top -= editor.vertical_scroll_margin() as f32;
+            scroll_target_bottom += editor.vertical_scroll_margin() as f32;

            let height_in_lines = editor.visible_line_count().unwrap_or(0.);
            let scroll_top = editor.scroll_position(cx).y;
@@ -1548,7 +1543,7 @@ struct EditorInlineAssists {

 struct InlineAssistScrollLock {
    assist_id: InlineAssistId,
-    distance_from_top: ScrollOffset,
+    distance_from_top: f32,
 }

 impl EditorInlineAssists {
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -3,20 +3,12 @@ use agent_settings::{
    AgentProfile, AgentProfileId, AgentSettings, AvailableProfiles, builtin_profiles,
 };
 use fs::Fs;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AnyElement, App, BackgroundExecutor, Context, DismissEvent, Entity, FocusHandle,
-    Focusable, SharedString, Subscription, Task, Window,
-};
-use picker::{Picker, PickerDelegate, popover_menu::PickerPopoverMenu};
-use settings::{Settings as _, SettingsStore, update_settings_file};
-use std::{
-    sync::atomic::Ordering,
-    sync::{Arc, atomic::AtomicBool},
-};
+use gpui::{Action, Entity, FocusHandle, Subscription, prelude::*};
+use settings::{DockPosition, Settings as _, SettingsStore, update_settings_file};
+use std::sync::Arc;
 use ui::{
-    DocumentationAside, DocumentationEdge, DocumentationSide, HighlightedLabel, LabelSize,
-    ListItem, ListItemSpacing, PopoverMenuHandle, TintColor, Tooltip, prelude::*,
+    ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, PopoverMenu,
+    PopoverMenuHandle, TintColor, Tooltip, prelude::*,
 };

 /// Trait for types that can provide and manage agent profiles
@@ -33,11 +25,9 @@ pub trait ProfileProvider {

 pub struct ProfileSelector {
    profiles: AvailableProfiles,
-    pending_refresh: bool,
    fs: Arc<dyn Fs>,
    provider: Arc<dyn ProfileProvider>,
-    picker: Option<Entity<Picker<ProfilePickerDelegate>>>,
-    picker_handle: PopoverMenuHandle<Picker<ProfilePickerDelegate>>,
+    menu_handle: PopoverMenuHandle<ContextMenu>,
    focus_handle: FocusHandle,
    _subscriptions: Vec<Subscription>,
 }
@@ -50,91 +40,125 @@ impl ProfileSelector {
        cx: &mut Context<Self>,
    ) -> Self {
        let settings_subscription = cx.observe_global::<SettingsStore>(move |this, cx| {
-            this.pending_refresh = true;
-            cx.notify();
+            this.refresh_profiles(cx);
        });

        Self {
            profiles: AgentProfile::available_profiles(cx),
-            pending_refresh: false,
            fs,
            provider,
-            picker: None,
-            picker_handle: PopoverMenuHandle::default(),
+            menu_handle: PopoverMenuHandle::default(),
            focus_handle,
            _subscriptions: vec![settings_subscription],
        }
    }

-    pub fn menu_handle(&self) -> PopoverMenuHandle<Picker<ProfilePickerDelegate>> {
-        self.picker_handle.clone()
+    pub fn menu_handle(&self) -> PopoverMenuHandle<ContextMenu> {
+        self.menu_handle.clone()
    }

-    fn ensure_picker(
-        &mut self,
+    fn refresh_profiles(&mut self, cx: &mut Context<Self>) {
+        self.profiles = AgentProfile::available_profiles(cx);
+    }
+
+    fn build_context_menu(
+        &self,
        window: &mut Window,
        cx: &mut Context<Self>,
-    ) -> Entity<Picker<ProfilePickerDelegate>> {
-        if self.picker.is_none() {
-            let delegate = ProfilePickerDelegate::new(
-                self.fs.clone(),
-                self.provider.clone(),
-                self.profiles.clone(),
-                cx.background_executor().clone(),
-                cx,
-            );
+    ) -> Entity<ContextMenu> {
+        ContextMenu::build(window, cx, |mut menu, _window, cx| {
+            let settings = AgentSettings::get_global(cx);

-            let picker = cx.new(|cx| {
-                Picker::list(delegate, window, cx)
-                    .show_scrollbar(true)
-                    .width(rems(18.))
-                    .max_height(Some(rems(20.).into()))
-            });
-
-            self.picker = Some(picker);
-        }
-
-        if self.pending_refresh {
-            if let Some(picker) = &self.picker {
-                let profiles = AgentProfile::available_profiles(cx);
-                self.profiles = profiles.clone();
-                picker.update(cx, |picker, cx| {
-                    let query = picker.query(cx);
-                    picker
-                        .delegate
-                        .refresh_profiles(profiles.clone(), query, cx);
-                });
+            let mut found_non_builtin = false;
+            for (profile_id, profile_name) in self.profiles.iter() {
+                if !builtin_profiles::is_builtin(profile_id) {
+                    found_non_builtin = true;
+                    continue;
+                }
+                menu = menu.item(self.menu_entry_for_profile(
+                    profile_id.clone(),
+                    profile_name,
+                    settings,
+                    cx,
+                ));
            }
-            self.pending_refresh = false;
-        }

-        self.picker.as_ref().unwrap().clone()
+            if found_non_builtin {
+                menu = menu.separator().header("Custom Profiles");
+                for (profile_id, profile_name) in self.profiles.iter() {
+                    if builtin_profiles::is_builtin(profile_id) {
+                        continue;
+                    }
+                    menu = menu.item(self.menu_entry_for_profile(
+                        profile_id.clone(),
+                        profile_name,
+                        settings,
+                        cx,
+                    ));
+                }
+            }
+
+            menu = menu.separator();
+            menu = menu.item(ContextMenuEntry::new("Configure Profiles…").handler(
+                move |window, cx| {
+                    window.dispatch_action(ManageProfiles::default().boxed_clone(), cx);
+                },
+            ));
+
+            menu
+        })
    }
-}

-impl Focusable for ProfileSelector {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        if let Some(picker) = &self.picker {
-            picker.focus_handle(cx)
+    fn menu_entry_for_profile(
+        &self,
+        profile_id: AgentProfileId,
+        profile_name: &SharedString,
+        settings: &AgentSettings,
+        cx: &App,
+    ) -> ContextMenuEntry {
+        let documentation = match profile_name.to_lowercase().as_str() {
+            builtin_profiles::WRITE => Some("Get help to write anything."),
+            builtin_profiles::ASK => Some("Chat about your codebase."),
+            builtin_profiles::MINIMAL => Some("Chat about anything with no tools."),
+            _ => None,
+        };
+        let thread_profile_id = self.provider.profile_id(cx);
+
+        let entry = ContextMenuEntry::new(profile_name.clone())
+            .toggleable(IconPosition::End, profile_id == thread_profile_id);
+
+        let entry = if let Some(doc_text) = documentation {
+            entry.documentation_aside(
+                documentation_side(settings.dock),
+                DocumentationEdge::Top,
+                move |_| Label::new(doc_text).into_any_element(),
+            )
        } else {
-            self.focus_handle.clone()
-        }
+            entry
+        };
+
+        entry.handler({
+            let fs = self.fs.clone();
+            let provider = self.provider.clone();
+            move |_window, cx| {
+                update_settings_file(fs.clone(), cx, {
+                    let profile_id = profile_id.clone();
+                    move |settings, _cx| {
+                        settings
+                            .agent
+                            .get_or_insert_default()
+                            .set_profile(profile_id.0);
+                    }
+                });
+
+                provider.set_profile(profile_id.clone(), cx);
+            }
+        })
    }
 }

 impl Render for ProfileSelector {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.provider.profiles_supported(cx) {
-            return Button::new("tools-not-supported-button", "Tools Unsupported")
-                .disabled(true)
-                .label_size(LabelSize::Small)
-                .color(Color::Muted)
-                .tooltip(Tooltip::text("This model does not support tools."))
-                .into_any_element();
-        }
-
-        let picker = self.ensure_picker(window, cx);
-
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let settings = AgentSettings::get_global(cx);
        let profile_id = self.provider.profile_id(cx);
        let profile = settings.profiles.get(&profile_id);
@@ -142,594 +166,62 @@ impl Render for ProfileSelector {
        let selected_profile = profile
            .map(|profile| profile.name.clone())
            .unwrap_or_else(|| "Unknown".into());
-        let focus_handle = self.focus_handle.clone();

-        let trigger_button = Button::new("profile-selector", selected_profile)
-            .label_size(LabelSize::Small)
-            .color(Color::Muted)
-            .icon(IconName::ChevronDown)
-            .icon_size(IconSize::XSmall)
-            .icon_position(IconPosition::End)
-            .icon_color(Color::Muted)
-            .selected_style(ButtonStyle::Tinted(TintColor::Accent));
+        if self.provider.profiles_supported(cx) {
+            let this = cx.entity();
+            let focus_handle = self.focus_handle.clone();
+            let trigger_button = Button::new("profile-selector-model", selected_profile)
+                .label_size(LabelSize::Small)
+                .color(Color::Muted)
+                .icon(IconName::ChevronDown)
+                .icon_size(IconSize::XSmall)
+                .icon_position(IconPosition::End)
+                .icon_color(Color::Muted)
+                .selected_style(ButtonStyle::Tinted(TintColor::Accent));

-        PickerPopoverMenu::new(
-            picker,
-            trigger_button,
-            move |window, cx| {
-                Tooltip::for_action_in(
-                    "Toggle Profile Menu",
-                    &ToggleProfileSelector,
-                    &focus_handle,
-                    window,
-                    cx,
-                )
-            },
-            gpui::Corner::BottomRight,
-            cx,
-        )
-        .with_handle(self.picker_handle.clone())
-        .render(window, cx)
-        .into_any_element()
-    }
-}
-
-#[derive(Clone)]
-struct ProfileCandidate {
-    id: AgentProfileId,
-    name: SharedString,
-    is_builtin: bool,
-}
-
-#[derive(Clone)]
-struct ProfileMatchEntry {
-    candidate_index: usize,
-    positions: Vec<usize>,
-}
-
-enum ProfilePickerEntry {
-    Header(SharedString),
-    Profile(ProfileMatchEntry),
-}
-
-pub(crate) struct ProfilePickerDelegate {
-    fs: Arc<dyn Fs>,
-    provider: Arc<dyn ProfileProvider>,
-    background: BackgroundExecutor,
-    candidates: Vec<ProfileCandidate>,
-    string_candidates: Arc<Vec<StringMatchCandidate>>,
-    filtered_entries: Vec<ProfilePickerEntry>,
-    selected_index: usize,
-    query: String,
-    cancel: Option<Arc<AtomicBool>>,
-}
-
-impl ProfilePickerDelegate {
-    fn new(
-        fs: Arc<dyn Fs>,
-        provider: Arc<dyn ProfileProvider>,
-        profiles: AvailableProfiles,
-        background: BackgroundExecutor,
-        cx: &mut Context<ProfileSelector>,
-    ) -> Self {
-        let candidates = Self::candidates_from(profiles);
-        let string_candidates = Arc::new(Self::string_candidates(&candidates));
-        let filtered_entries = Self::entries_from_candidates(&candidates);
-
-        let mut this = Self {
-            fs,
-            provider,
-            background,
-            candidates,
-            string_candidates,
-            filtered_entries,
-            selected_index: 0,
-            query: String::new(),
-            cancel: None,
-        };
-
-        this.selected_index = this
-            .index_of_profile(&this.provider.profile_id(cx))
-            .unwrap_or_else(|| this.first_selectable_index().unwrap_or(0));
-
-        this
-    }
-
-    fn refresh_profiles(
-        &mut self,
-        profiles: AvailableProfiles,
-        query: String,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        self.candidates = Self::candidates_from(profiles);
-        self.string_candidates = Arc::new(Self::string_candidates(&self.candidates));
-        self.query = query;
-
-        if self.query.is_empty() {
-            self.filtered_entries = Self::entries_from_candidates(&self.candidates);
-        } else {
-            let matches = self.search_blocking(&self.query);
-            self.filtered_entries = self.entries_from_matches(matches);
-        }
-
-        self.selected_index = self
-            .index_of_profile(&self.provider.profile_id(cx))
-            .unwrap_or_else(|| self.first_selectable_index().unwrap_or(0));
-        cx.notify();
-    }
-
-    fn candidates_from(profiles: AvailableProfiles) -> Vec<ProfileCandidate> {
-        profiles
-            .into_iter()
-            .map(|(id, name)| ProfileCandidate {
-                is_builtin: builtin_profiles::is_builtin(&id),
-                id,
-                name,
-            })
-            .collect()
-    }
-
-    fn string_candidates(candidates: &[ProfileCandidate]) -> Vec<StringMatchCandidate> {
-        candidates
-            .iter()
-            .enumerate()
-            .map(|(index, candidate)| StringMatchCandidate::new(index, candidate.name.as_ref()))
-            .collect()
-    }
-
-    fn documentation(candidate: &ProfileCandidate) -> Option<&'static str> {
-        match candidate.id.as_str() {
-            builtin_profiles::WRITE => Some("Get help to write anything."),
-            builtin_profiles::ASK => Some("Chat about your codebase."),
-            builtin_profiles::MINIMAL => Some("Chat about anything with no tools."),
-            _ => None,
-        }
-    }
-
-    fn entries_from_candidates(candidates: &[ProfileCandidate]) -> Vec<ProfilePickerEntry> {
-        let mut entries = Vec::new();
-        let mut inserted_custom_header = false;
-
-        for (idx, candidate) in candidates.iter().enumerate() {
-            if !candidate.is_builtin && !inserted_custom_header {
-                if !entries.is_empty() {
-                    entries.push(ProfilePickerEntry::Header("Custom Profiles".into()));
-                }
-                inserted_custom_header = true;
-            }
-
-            entries.push(ProfilePickerEntry::Profile(ProfileMatchEntry {
-                candidate_index: idx,
-                positions: Vec::new(),
-            }));
-        }
-
-        entries
-    }
-
-    fn entries_from_matches(&self, matches: Vec<StringMatch>) -> Vec<ProfilePickerEntry> {
-        let mut entries = Vec::new();
-        for mat in matches {
-            if self.candidates.get(mat.candidate_id).is_some() {
-                entries.push(ProfilePickerEntry::Profile(ProfileMatchEntry {
-                    candidate_index: mat.candidate_id,
-                    positions: mat.positions,
-                }));
-            }
-        }
-        entries
-    }
-
-    fn first_selectable_index(&self) -> Option<usize> {
-        self.filtered_entries
-            .iter()
-            .position(|entry| matches!(entry, ProfilePickerEntry::Profile(_)))
-    }
-
-    fn index_of_profile(&self, profile_id: &AgentProfileId) -> Option<usize> {
-        self.filtered_entries.iter().position(|entry| {
-            matches!(entry, ProfilePickerEntry::Profile(profile) if self
-                .candidates
-                .get(profile.candidate_index)
-                .map(|candidate| &candidate.id == profile_id)
-                .unwrap_or(false))
-        })
-    }
-
-    fn search_blocking(&self, query: &str) -> Vec<StringMatch> {
-        if query.is_empty() {
-            return self
-                .string_candidates
-                .iter()
-                .map(|candidate| StringMatch {
-                    candidate_id: candidate.id,
-                    score: 0.0,
-                    positions: Vec::new(),
-                    string: candidate.string.clone(),
+            PopoverMenu::new("profile-selector")
+                .trigger_with_tooltip(trigger_button, {
+                    move |window, cx| {
+                        Tooltip::for_action_in(
+                            "Toggle Profile Menu",
+                            &ToggleProfileSelector,
+                            &focus_handle,
+                            window,
+                            cx,
+                        )
+                    }
                })
-                .collect();
-        }
-
-        let cancel_flag = AtomicBool::new(false);
-
-        self.background.block(match_strings(
-            self.string_candidates.as_ref(),
-            query,
-            false,
-            true,
-            100,
-            &cancel_flag,
-            self.background.clone(),
-        ))
-    }
-}
-
-impl PickerDelegate for ProfilePickerDelegate {
-    type ListItem = AnyElement;
-
-    fn placeholder_text(&self, _: &mut Window, _: &mut App) -> Arc<str> {
-        "Search profiles…".into()
-    }
-
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        let text = if self.candidates.is_empty() {
-            "No profiles.".into()
+                .anchor(
+                    if documentation_side(settings.dock) == DocumentationSide::Left {
+                        gpui::Corner::BottomRight
+                    } else {
+                        gpui::Corner::BottomLeft
+                    },
+                )
+                .with_handle(self.menu_handle.clone())
+                .menu(move |window, cx| {
+                    Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
+                })
+                .offset(gpui::Point {
+                    x: px(0.0),
+                    y: px(-2.0),
+                })
+                .into_any_element()
        } else {
-            "No profiles match your search.".into()
-        };
-        Some(text)
-    }
-
-    fn match_count(&self) -> usize {
-        self.filtered_entries.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix.min(self.filtered_entries.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn can_select(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        match self.filtered_entries.get(ix) {
-            Some(ProfilePickerEntry::Profile(_)) => true,
-            Some(ProfilePickerEntry::Header(_)) | None => false,
-        }
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        if query.is_empty() {
-            self.query.clear();
-            self.filtered_entries = Self::entries_from_candidates(&self.candidates);
-            self.selected_index = self
-                .index_of_profile(&self.provider.profile_id(cx))
-                .unwrap_or_else(|| self.first_selectable_index().unwrap_or(0));
-            cx.notify();
-            return Task::ready(());
-        }
-
-        if let Some(prev) = &self.cancel {
-            prev.store(true, Ordering::Relaxed);
-        }
-        let cancel = Arc::new(AtomicBool::new(false));
-        self.cancel = Some(cancel.clone());
-
-        let string_candidates = self.string_candidates.clone();
-        let background = self.background.clone();
-        let provider = self.provider.clone();
-        self.query = query.clone();
-
-        let cancel_for_future = cancel;
-
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = match_strings(
-                string_candidates.as_ref(),
-                &query,
-                false,
-                true,
-                100,
-                cancel_for_future.as_ref(),
-                background,
-            )
-            .await;
-
-            this.update_in(cx, |this, _, cx| {
-                if this.delegate.query != query {
-                    return;
-                }
-
-                this.delegate.filtered_entries = this.delegate.entries_from_matches(matches);
-                this.delegate.selected_index = this
-                    .delegate
-                    .index_of_profile(&provider.profile_id(cx))
-                    .unwrap_or_else(|| this.delegate.first_selectable_index().unwrap_or(0));
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        match self.filtered_entries.get(self.selected_index) {
-            Some(ProfilePickerEntry::Profile(entry)) => {
-                if let Some(candidate) = self.candidates.get(entry.candidate_index) {
-                    let profile_id = candidate.id.clone();
-                    let fs = self.fs.clone();
-                    let provider = self.provider.clone();
-
-                    update_settings_file(fs, cx, {
-                        let profile_id = profile_id.clone();
-                        move |settings, _cx| {
-                            settings
-                                .agent
-                                .get_or_insert_default()
-                                .set_profile(profile_id.0);
-                        }
-                    });
-
-                    provider.set_profile(profile_id.clone(), cx);
-
-                    telemetry::event!(
-                        "agent_profile_switched",
-                        profile_id = profile_id.as_str(),
-                        source = "picker"
-                    );
-                }
-
-                cx.emit(DismissEvent);
-            }
-            _ => {}
-        }
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.defer_in(window, |picker, window, cx| {
-            picker.set_query("", window, cx);
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        match self.filtered_entries.get(ix)? {
-            ProfilePickerEntry::Header(label) => Some(
-                div()
-                    .px_2p5()
-                    .pb_0p5()
-                    .when(ix > 0, |this| {
-                        this.mt_1p5()
-                            .pt_2()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                    })
-                    .child(
-                        Label::new(label.clone())
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            ),
-            ProfilePickerEntry::Profile(entry) => {
-                let candidate = self.candidates.get(entry.candidate_index)?;
-                let active_id = self.provider.profile_id(cx);
-                let is_active = active_id == candidate.id;
-
-                Some(
-                    ListItem::new(SharedString::from(candidate.id.0.clone()))
-                        .inset(true)
-                        .spacing(ListItemSpacing::Sparse)
-                        .toggle_state(selected)
-                        .child(HighlightedLabel::new(
-                            candidate.name.clone(),
-                            entry.positions.clone(),
-                        ))
-                        .when(is_active, |this| {
-                            this.end_slot(
-                                div()
-                                    .pr_2()
-                                    .child(Icon::new(IconName::Check).color(Color::Accent)),
-                            )
-                        })
-                        .into_any_element(),
-                )
-            }
-        }
-    }
-
-    fn documentation_aside(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<DocumentationAside> {
-        use std::rc::Rc;
-
-        let entry = match self.filtered_entries.get(self.selected_index)? {
-            ProfilePickerEntry::Profile(entry) => entry,
-            ProfilePickerEntry::Header(_) => return None,
-        };
-
-        let candidate = self.candidates.get(entry.candidate_index)?;
-        let docs_aside = Self::documentation(candidate)?.to_string();
-
-        let settings = AgentSettings::get_global(cx);
-        let side = match settings.dock {
-            settings::DockPosition::Left => DocumentationSide::Right,
-            settings::DockPosition::Bottom | settings::DockPosition::Right => {
-                DocumentationSide::Left
-            }
-        };
-
-        Some(DocumentationAside {
-            side,
-            edge: DocumentationEdge::Top,
-            render: Rc::new(move |_| Label::new(docs_aside.clone()).into_any_element()),
-        })
-    }
-
-    fn render_footer(
-        &self,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<gpui::AnyElement> {
-        Some(
-            h_flex()
-                .w_full()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .p_1()
-                .gap_4()
-                .justify_between()
-                .child(
-                    Button::new("configure", "Configure")
-                        .icon(IconName::Settings)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .icon_position(IconPosition::Start)
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(ManageProfiles::default().boxed_clone(), cx);
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui::TestAppContext;
-
-    #[gpui::test]
-    fn entries_include_custom_profiles(_cx: &mut TestAppContext) {
-        let candidates = vec![
-            ProfileCandidate {
-                id: AgentProfileId("write".into()),
-                name: SharedString::from("Write"),
-                is_builtin: true,
-            },
-            ProfileCandidate {
-                id: AgentProfileId("my-custom".into()),
-                name: SharedString::from("My Custom"),
-                is_builtin: false,
-            },
-        ];
-
-        let entries = ProfilePickerDelegate::entries_from_candidates(&candidates);
-
-        assert!(entries.iter().any(|entry| matches!(
-            entry,
-            ProfilePickerEntry::Profile(profile)
-                if candidates[profile.candidate_index].id.as_str() == "my-custom"
-        )));
-        assert!(entries.iter().any(|entry| matches!(
-            entry,
-            ProfilePickerEntry::Header(label) if label.as_ref() == "Custom Profiles"
-        )));
-    }
-
-    #[gpui::test]
-    fn fuzzy_filter_returns_no_results_and_keeps_configure(cx: &mut TestAppContext) {
-        let candidates = vec![ProfileCandidate {
-            id: AgentProfileId("write".into()),
-            name: SharedString::from("Write"),
-            is_builtin: true,
-        }];
-
-        let delegate = ProfilePickerDelegate {
-            fs: FakeFs::new(cx.executor()),
-            provider: Arc::new(TestProfileProvider::new(AgentProfileId("write".into()))),
-            background: cx.executor(),
-            candidates,
-            string_candidates: Arc::new(Vec::new()),
-            filtered_entries: Vec::new(),
-            selected_index: 0,
-            query: String::new(),
-            cancel: None,
-        };
-
-        let matches = Vec::new(); // No matches
-        let _entries = delegate.entries_from_matches(matches);
-    }
-
-    #[gpui::test]
-    fn active_profile_selection_logic_works(cx: &mut TestAppContext) {
-        let candidates = vec![
-            ProfileCandidate {
-                id: AgentProfileId("write".into()),
-                name: SharedString::from("Write"),
-                is_builtin: true,
-            },
-            ProfileCandidate {
-                id: AgentProfileId("ask".into()),
-                name: SharedString::from("Ask"),
-                is_builtin: true,
-            },
-        ];
-
-        let delegate = ProfilePickerDelegate {
-            fs: FakeFs::new(cx.executor()),
-            provider: Arc::new(TestProfileProvider::new(AgentProfileId("write".into()))),
-            background: cx.executor(),
-            candidates,
-            string_candidates: Arc::new(Vec::new()),
-            filtered_entries: vec![
-                ProfilePickerEntry::Profile(ProfileMatchEntry {
-                    candidate_index: 0,
-                    positions: Vec::new(),
-                }),
-                ProfilePickerEntry::Profile(ProfileMatchEntry {
-                    candidate_index: 1,
-                    positions: Vec::new(),
-                }),
-            ],
-            selected_index: 0,
-            query: String::new(),
-            cancel: None,
-        };
-
-        // Active profile should be found at index 0
-        let active_index = delegate.index_of_profile(&AgentProfileId("write".into()));
-        assert_eq!(active_index, Some(0));
-    }
-
-    struct TestProfileProvider {
-        profile_id: AgentProfileId,
-    }
-
-    impl TestProfileProvider {
-        fn new(profile_id: AgentProfileId) -> Self {
-            Self { profile_id }
-        }
-    }
-
-    impl ProfileProvider for TestProfileProvider {
-        fn profile_id(&self, _cx: &App) -> AgentProfileId {
-            self.profile_id.clone()
-        }
-
-        fn set_profile(&self, _profile_id: AgentProfileId, _cx: &mut App) {}
-
-        fn profiles_supported(&self, _cx: &App) -> bool {
-            true
+            Button::new("tools-not-supported-button", "Tools Unsupported")
+                .disabled(true)
+                .label_size(LabelSize::Small)
+                .color(Color::Muted)
+                .tooltip(Tooltip::text("This model does not support tools."))
+                .into_any_element()
        }
    }
 }
+
+fn documentation_side(position: DockPosition) -> DocumentationSide {
+    match position {
+        DockPosition::Left => DocumentationSide::Right,
+        DockPosition::Bottom => DocumentationSide::Left,
+        DockPosition::Right => DocumentationSide::Left,
+    }
+}
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -17,7 +17,6 @@ use editor::{
        BlockPlacement, BlockProperties, BlockStyle, Crease, CreaseMetadata, CustomBlockId, FoldId,
        RenderBlock, ToDisplayPoint,
    },
-    scroll::ScrollOffset,
 };
 use editor::{FoldPlaceholder, display_map::CreaseId};
 use fs::Fs;
@@ -109,7 +108,7 @@ pub enum InsertDraggedFiles {

 #[derive(Copy, Clone, Debug, PartialEq)]
 struct ScrollPosition {
-    offset_before_cursor: gpui::Point<ScrollOffset>,
+    offset_before_cursor: gpui::Point<f32>,
    cursor: Anchor,
 }

@@ -632,7 +631,7 @@ impl TextThreadEditor {
                        let snapshot = editor.snapshot(window, cx);
                        let cursor_point = scroll_position.cursor.to_display_point(&snapshot);
                        let scroll_top =
-                            cursor_point.row().as_f64() - scroll_position.offset_before_cursor.y;
+                            cursor_point.row().as_f32() - scroll_position.offset_before_cursor.y;
                        editor.set_scroll_position(
                            point(scroll_position.offset_before_cursor.x, scroll_top),
                            window,
@@ -980,7 +979,7 @@ impl TextThreadEditor {
            let cursor_row = cursor
                .to_display_point(&snapshot.display_snapshot)
                .row()
-                .as_f64();
+                .as_f32();
            let scroll_position = editor
                .scroll_manager
                .anchor()
--- a/crates/agent_ui/src/ui/burn_mode_tooltip.rs
+++ b/crates/agent_ui/src/ui/burn_mode_tooltip.rs
@@ -48,7 +48,7 @@ impl Render for BurnModeTooltip {
        let keybinding = KeyBinding::for_action(&ToggleBurnMode, window, cx)
            .map(|kb| kb.size(rems_from_px(12.)));

-        tooltip_container(cx, |this, _| {
+        tooltip_container(window, cx, |this, _, _| {
            this
                .child(
                    h_flex()
--- a/crates/agent_ui/src/ui/context_pill.rs
+++ b/crates/agent_ui/src/ui/context_pill.rs
@@ -704,7 +704,7 @@ impl ContextPillHover {

 impl Render for ContextPillHover {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, move |this, cx| {
+        tooltip_container(window, cx, move |this, window, cx| {
            this.occlude()
                .on_mouse_move(|_, _, cx| cx.stop_propagation())
                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
--- a/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
+++ b/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
@@ -12,8 +12,8 @@ impl UnavailableEditingTooltip {
 }

 impl Render for UnavailableEditingTooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |this, _| {
+    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!(
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -16,8 +16,8 @@ anyhow.workspace = true
 futures.workspace = true
 gpui.workspace = true
 net.workspace = true
+proto.workspace = true
 smol.workspace = true
-log.workspace = true
 tempfile.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
@@ -25,6 +25,3 @@ zeroize.workspace = true

 [target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["log"]
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -1,16 +1,10 @@
 mod encrypted_password;

-pub use encrypted_password::{EncryptedPassword, IKnowWhatIAmDoingAndIHaveReadTheDocs};
+pub use encrypted_password::{EncryptedPassword, ProcessExt};

-use net::async_net::UnixListener;
-use smol::lock::Mutex;
-use util::fs::make_file_executable;
-
-use std::ffi::OsStr;
-use std::ops::ControlFlow;
-use std::sync::Arc;
+#[cfg(target_os = "windows")]
 use std::sync::OnceLock;
-use std::time::Duration;
+use std::{ffi::OsStr, time::Duration};

 use anyhow::{Context as _, Result};
 use futures::channel::{mpsc, oneshot};
@@ -20,13 +14,9 @@ use futures::{
 };
 use gpui::{AsyncApp, BackgroundExecutor, Task};
 use smol::fs;
-use util::{ResultExt as _, debug_panic, maybe, paths::PathExt};
+use util::ResultExt as _;

-/// Path to the program used for askpass
-///
-/// On Unix and remote servers, this defaults to the current executable
-/// On Windows, this is set to the CLI variant of zed
-static ASKPASS_PROGRAM: OnceLock<std::path::PathBuf> = OnceLock::new();
+use crate::encrypted_password::decrypt;

 #[derive(PartialEq, Eq)]
 pub enum AskPassResult {
@@ -36,7 +26,6 @@ pub enum AskPassResult {

 pub struct AskPassDelegate {
    tx: mpsc::UnboundedSender<(String, oneshot::Sender<EncryptedPassword>)>,
-    executor: BackgroundExecutor,
    _task: Task<()>,
 }

@@ -54,27 +43,24 @@ impl AskPassDelegate {
                password_prompt(prompt, channel, cx);
            }
        });
-        Self {
-            tx,
-            _task: task,
-            executor: cx.background_executor().clone(),
-        }
+        Self { tx, _task: task }
    }

-    pub fn ask_password(&mut self, prompt: String) -> Task<Option<EncryptedPassword>> {
-        let mut this_tx = self.tx.clone();
-        self.executor.spawn(async move {
-            let (tx, rx) = oneshot::channel();
-            this_tx.send((prompt, tx)).await.ok()?;
-            rx.await.ok()
-        })
+    pub async fn ask_password(&mut self, prompt: String) -> Result<EncryptedPassword> {
+        let (tx, rx) = oneshot::channel();
+        self.tx.send((prompt, tx)).await?;
+        Ok(rx.await?)
    }
 }

 pub struct AskPassSession {
+    #[cfg(not(target_os = "windows"))]
+    script_path: std::path::PathBuf,
+    #[cfg(target_os = "windows")]
+    askpass_helper: String,
    #[cfg(target_os = "windows")]
    secret: std::sync::Arc<OnceLock<EncryptedPassword>>,
-    askpass_task: PasswordProxy,
+    _askpass_task: Task<()>,
    askpass_opened_rx: Option<oneshot::Receiver<()>>,
    askpass_kill_master_rx: Option<oneshot::Receiver<()>>,
 }
@@ -89,57 +75,104 @@ impl AskPassSession {
    /// You must retain this session until the master process exits.
    #[must_use]
    pub async fn new(executor: &BackgroundExecutor, mut delegate: AskPassDelegate) -> Result<Self> {
+        use net::async_net::UnixListener;
+        use util::fs::make_file_executable;
+
        #[cfg(target_os = "windows")]
        let secret = std::sync::Arc::new(OnceLock::new());
+        let temp_dir = tempfile::Builder::new().prefix("zed-askpass").tempdir()?;
+        let askpass_socket = temp_dir.path().join("askpass.sock");
+        let askpass_script_path = temp_dir.path().join(ASKPASS_SCRIPT_NAME);
        let (askpass_opened_tx, askpass_opened_rx) = oneshot::channel::<()>();
-
-        let askpass_opened_tx = Arc::new(Mutex::new(Some(askpass_opened_tx)));
+        let listener = UnixListener::bind(&askpass_socket).context("creating askpass socket")?;
+        #[cfg(not(target_os = "windows"))]
+        let zed_path = util::get_shell_safe_zed_path()?;
+        #[cfg(target_os = "windows")]
+        let zed_path = std::env::current_exe()
+            .context("finding current executable path for use in askpass")?;

        let (askpass_kill_master_tx, askpass_kill_master_rx) = oneshot::channel::<()>();
-        let kill_tx = Arc::new(Mutex::new(Some(askpass_kill_master_tx)));
+        let mut kill_tx = Some(askpass_kill_master_tx);

        #[cfg(target_os = "windows")]
        let askpass_secret = secret.clone();
-        let get_password = {
-            let executor = executor.clone();
+        let askpass_task = executor.spawn(async move {
+            let mut askpass_opened_tx = Some(askpass_opened_tx);

-            move |prompt| {
-                let prompt = delegate.ask_password(prompt);
-                let kill_tx = kill_tx.clone();
-                let askpass_opened_tx = askpass_opened_tx.clone();
-                #[cfg(target_os = "windows")]
-                let askpass_secret = askpass_secret.clone();
-                executor.spawn(async move {
-                    if let Some(askpass_opened_tx) = askpass_opened_tx.lock().await.take() {
-                        askpass_opened_tx.send(()).ok();
+            while let Ok((mut stream, _)) = listener.accept().await {
+                if let Some(askpass_opened_tx) = askpass_opened_tx.take() {
+                    askpass_opened_tx.send(()).ok();
+                }
+                let mut buffer = Vec::new();
+                let mut reader = BufReader::new(&mut stream);
+                if reader.read_until(b'\0', &mut buffer).await.is_err() {
+                    buffer.clear();
+                }
+                let prompt = String::from_utf8_lossy(&buffer);
+                if let Some(password) = delegate
+                    .ask_password(prompt.to_string())
+                    .await
+                    .context("getting askpass password")
+                    .log_err()
+                {
+                    #[cfg(target_os = "windows")]
+                    {
+                        askpass_secret.get_or_init(|| password.clone());
                    }
-                    if let Some(password) = prompt.await {
-                        #[cfg(target_os = "windows")]
-                        {
-                            _ = askpass_secret.set(password.clone());
-                        }
-                        ControlFlow::Continue(Ok(password))
-                    } else {
-                        if let Some(kill_tx) = kill_tx.lock().await.take() {
-                            kill_tx.send(()).log_err();
-                        }
-                        ControlFlow::Break(())
+                    if let Ok(decrypted) = decrypt(password) {
+                        stream.write_all(decrypted.as_bytes()).await.log_err();
                    }
-                })
+                } else {
+                    if let Some(kill_tx) = kill_tx.take() {
+                        kill_tx.send(()).log_err();
+                    }
+                    // note: we expect the caller to drop this task when it's done.
+                    // We need to keep the stream open until the caller is done to avoid
+                    // spurious errors from ssh.
+                    std::future::pending::<()>().await;
+                    drop(stream);
+                }
            }
-        };
-        let askpass_task = PasswordProxy::new(get_password, executor.clone()).await?;
+            drop(temp_dir)
+        });
+
+        // Create an askpass script that communicates back to this process.
+        let askpass_script = generate_askpass_script(&zed_path, &askpass_socket);
+        fs::write(&askpass_script_path, askpass_script)
+            .await
+            .with_context(|| format!("creating askpass script at {askpass_script_path:?}"))?;
+        make_file_executable(&askpass_script_path).await?;
+        #[cfg(target_os = "windows")]
+        let askpass_helper = format!(
+            "powershell.exe -ExecutionPolicy Bypass -File {}",
+            askpass_script_path.display()
+        );

        Ok(Self {
+            #[cfg(not(target_os = "windows"))]
+            script_path: askpass_script_path,
+
            #[cfg(target_os = "windows")]
            secret,
+            #[cfg(target_os = "windows")]
+            askpass_helper,

-            askpass_task,
+            _askpass_task: askpass_task,
            askpass_kill_master_rx: Some(askpass_kill_master_rx),
            askpass_opened_rx: Some(askpass_opened_rx),
        })
    }

+    #[cfg(not(target_os = "windows"))]
+    pub fn script_path(&self) -> impl AsRef<OsStr> {
+        &self.script_path
+    }
+
+    #[cfg(target_os = "windows")]
+    pub fn script_path(&self) -> impl AsRef<OsStr> {
+        &self.askpass_helper
+    }
+
    // This will run the askpass task forever, resolving as many authentication requests as needed.
    // The caller is responsible for examining the result of their own commands and cancelling this
    // future when this is no longer needed. Note that this can only be called once, but due to the
@@ -171,109 +204,8 @@ impl AskPassSession {
    pub fn get_password(&self) -> Option<EncryptedPassword> {
        self.secret.get().cloned()
    }
-
-    pub fn script_path(&self) -> impl AsRef<OsStr> {
-        self.askpass_task.script_path()
-    }
 }

-pub struct PasswordProxy {
-    _task: Task<()>,
-    #[cfg(not(target_os = "windows"))]
-    askpass_script_path: std::path::PathBuf,
-    #[cfg(target_os = "windows")]
-    askpass_helper: String,
-}
-
-impl PasswordProxy {
-    pub async fn new(
-        mut get_password: impl FnMut(String) -> Task<ControlFlow<(), Result<EncryptedPassword>>>
-        + 'static
-        + Send
-        + Sync,
-        executor: BackgroundExecutor,
-    ) -> Result<Self> {
-        let temp_dir = tempfile::Builder::new().prefix("zed-askpass").tempdir()?;
-        let askpass_socket = temp_dir.path().join("askpass.sock");
-        let askpass_script_path = temp_dir.path().join(ASKPASS_SCRIPT_NAME);
-        let current_exec =
-            std::env::current_exe().context("Failed to determine current zed executable path.")?;
-
-        let askpass_program = ASKPASS_PROGRAM
-            .get_or_init(|| current_exec)
-            .try_shell_safe()
-            .context("Failed to shell-escape Askpass program path.")?
-            .to_string();
-        // Create an askpass script that communicates back to this process.
-        let askpass_script = generate_askpass_script(&askpass_program, &askpass_socket);
-        let _task = executor.spawn(async move {
-            maybe!(async move {
-                let listener =
-                    UnixListener::bind(&askpass_socket).context("creating askpass socket")?;
-
-                while let Ok((mut stream, _)) = listener.accept().await {
-                    let mut buffer = Vec::new();
-                    let mut reader = BufReader::new(&mut stream);
-                    if reader.read_until(b'\0', &mut buffer).await.is_err() {
-                        buffer.clear();
-                    }
-                    let prompt = String::from_utf8_lossy(&buffer).into_owned();
-                    let password = get_password(prompt).await;
-                    match password {
-                        ControlFlow::Continue(password) => {
-                            if let Ok(password) = password
-                                && let Ok(decrypted) =
-                                    password.decrypt(IKnowWhatIAmDoingAndIHaveReadTheDocs)
-                            {
-                                stream.write_all(decrypted.as_bytes()).await.log_err();
-                            }
-                        }
-                        ControlFlow::Break(()) => {
-                            // note: we expect the caller to drop this task when it's done.
-                            // We need to keep the stream open until the caller is done to avoid
-                            // spurious errors from ssh.
-                            std::future::pending::<()>().await;
-                            drop(stream);
-                        }
-                    }
-                }
-                drop(temp_dir);
-                Result::<_, anyhow::Error>::Ok(())
-            })
-            .await
-            .log_err();
-        });
-
-        fs::write(&askpass_script_path, askpass_script)
-            .await
-            .with_context(|| format!("creating askpass script at {askpass_script_path:?}"))?;
-        make_file_executable(&askpass_script_path).await?;
-        #[cfg(target_os = "windows")]
-        let askpass_helper = format!(
-            "powershell.exe -ExecutionPolicy Bypass -File {}",
-            askpass_script_path.display()
-        );
-
-        Ok(Self {
-            _task,
-            #[cfg(not(target_os = "windows"))]
-            askpass_script_path,
-            #[cfg(target_os = "windows")]
-            askpass_helper,
-        })
-    }
-
-    pub fn script_path(&self) -> impl AsRef<OsStr> {
-        #[cfg(not(target_os = "windows"))]
-        {
-            &self.askpass_script_path
-        }
-        #[cfg(target_os = "windows")]
-        {
-            &self.askpass_helper
-        }
-    }
-}
 /// The main function for when Zed is running in netcat mode for use in askpass.
 /// Called from both the remote server binary and the zed binary in their respective main functions.
 pub fn main(socket: &str) {
@@ -320,17 +252,12 @@ pub fn main(socket: &str) {
    }
 }

-pub fn set_askpass_program(path: std::path::PathBuf) {
-    if ASKPASS_PROGRAM.set(path).is_err() {
-        debug_panic!("askpass program has already been set");
-    }
-}
-
 #[inline]
 #[cfg(not(target_os = "windows"))]
-fn generate_askpass_script(askpass_program: &str, askpass_socket: &std::path::Path) -> String {
+fn generate_askpass_script(zed_path: &str, askpass_socket: &std::path::Path) -> String {
    format!(
-        "{shebang}\n{print_args} | {askpass_program} --askpass={askpass_socket} 2> /dev/null \n",
+        "{shebang}\n{print_args} | {zed_exe} --askpass={askpass_socket} 2> /dev/null \n",
+        zed_exe = zed_path,
        askpass_socket = askpass_socket.display(),
        print_args = "printf '%s\\0' \"$@\"",
        shebang = "#!/bin/sh",
@@ -339,12 +266,13 @@ fn generate_askpass_script(askpass_program: &str, askpass_socket: &std::path::Pa

 #[inline]
 #[cfg(target_os = "windows")]
-fn generate_askpass_script(askpass_program: &str, askpass_socket: &std::path::Path) -> String {
+fn generate_askpass_script(zed_path: &std::path::Path, askpass_socket: &std::path::Path) -> String {
    format!(
        r#"
        $ErrorActionPreference = 'Stop';
-        ($args -join [char]0) | & "{askpass_program}" --askpass={askpass_socket} 2> $null
+        ($args -join [char]0) | & "{zed_exe}" --askpass={askpass_socket} 2> $null
        "#,
+        zed_exe = zed_path.display(),
        askpass_socket = askpass_socket.display(),
    )
 }
--- a/crates/askpass/src/encrypted_password.rs
+++ b/crates/askpass/src/encrypted_password.rs
@@ -21,6 +21,27 @@ type LengthWithoutPadding = u32;
 #[derive(Clone)]
 pub struct EncryptedPassword(Vec<u8>, LengthWithoutPadding);

+pub trait ProcessExt {
+    fn encrypted_env(&mut self, name: &str, value: EncryptedPassword) -> &mut Self;
+}
+
+impl ProcessExt for smol::process::Command {
+    fn encrypted_env(&mut self, name: &str, value: EncryptedPassword) -> &mut Self {
+        if let Ok(password) = decrypt(value) {
+            self.env(name, password);
+        }
+        self
+    }
+}
+
+impl TryFrom<EncryptedPassword> for proto::AskPassResponse {
+    type Error = anyhow::Error;
+    fn try_from(pw: EncryptedPassword) -> Result<Self, Self::Error> {
+        let pw = decrypt(pw)?;
+        Ok(Self { response: pw })
+    }
+}
+
 impl Drop for EncryptedPassword {
    fn drop(&mut self) {
        self.0.zeroize();
@@ -46,7 +67,7 @@ impl TryFrom<&str> for EncryptedPassword {
                unsafe {
                    CryptProtectMemory(
                        value.as_mut_ptr() as _,
-                        padded_length,
+                        len,
                        CRYPTPROTECTMEMORY_SAME_PROCESS,
                    )?;
                }
@@ -58,45 +79,38 @@ impl TryFrom<&str> for EncryptedPassword {
    }
 }

-/// Read the docs for [EncryptedPassword]; please take care of not storing the plaintext string in memory for extended
-/// periods of time.
-pub struct IKnowWhatIAmDoingAndIHaveReadTheDocs;
-
-impl EncryptedPassword {
-    pub fn decrypt(mut self, _: IKnowWhatIAmDoingAndIHaveReadTheDocs) -> Result<String> {
-        #[cfg(windows)]
-        {
-            use anyhow::Context;
-            use windows::Win32::Security::Cryptography::{
-                CRYPTPROTECTMEMORY_BLOCK_SIZE, CRYPTPROTECTMEMORY_SAME_PROCESS,
-                CryptUnprotectMemory,
+pub(crate) fn decrypt(mut password: EncryptedPassword) -> Result<String> {
+    #[cfg(windows)]
+    {
+        use anyhow::Context;
+        use windows::Win32::Security::Cryptography::{
+            CRYPTPROTECTMEMORY_BLOCK_SIZE, CRYPTPROTECTMEMORY_SAME_PROCESS, CryptUnprotectMemory,
+        };
+        assert_eq!(
+            password.0.len() % CRYPTPROTECTMEMORY_BLOCK_SIZE as usize,
+            0,
+            "Violated pre-condition (buffer size <{}> must be a multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE <{}>) for CryptUnprotectMemory.",
+            password.0.len(),
+            CRYPTPROTECTMEMORY_BLOCK_SIZE
+        );
+        if password.1 != 0 {
+            unsafe {
+                CryptUnprotectMemory(
+                    password.0.as_mut_ptr() as _,
+                    password.1,
+                    CRYPTPROTECTMEMORY_SAME_PROCESS,
+                )
+                .context("while decrypting a SSH password")?
            };
-            assert_eq!(
-                self.0.len() % CRYPTPROTECTMEMORY_BLOCK_SIZE as usize,
-                0,
-                "Violated pre-condition (buffer size <{}> must be a multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE <{}>) for CryptUnprotectMemory.",
-                self.0.len(),
-                CRYPTPROTECTMEMORY_BLOCK_SIZE
-            );
-            if self.1 != 0 {
-                unsafe {
-                    CryptUnprotectMemory(
-                        self.0.as_mut_ptr() as _,
-                        self.0.len().try_into()?,
-                        CRYPTPROTECTMEMORY_SAME_PROCESS,
-                    )
-                    .context("while decrypting a SSH password")?
-                };

-                {
-                    // Remove padding
-                    _ = self.0.drain(self.1 as usize..);
-                }
+            {
+                // Remove padding
+                _ = password.0.drain(password.1 as usize..);
            }
-
-            Ok(String::from_utf8(std::mem::take(&mut self.0))?)
        }
-        #[cfg(not(windows))]
-        Ok(String::from_utf8(std::mem::take(&mut self.0))?)
+
+        Ok(String::from_utf8(std::mem::take(&mut password.0))?)
    }
+    #[cfg(not(windows))]
+    Ok(String::from_utf8(std::mem::take(&mut password.0))?)
 }
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -6,7 +6,7 @@ use assistant_slash_command::{
 use fuzzy::{PathMatch, StringMatchCandidate};
 use gpui::{App, Entity, Task, WeakEntity};
 use language::{
-    Anchor, BufferSnapshot, DiagnosticEntryRef, DiagnosticSeverity, LspAdapterDelegate,
+    Anchor, BufferSnapshot, DiagnosticEntry, DiagnosticSeverity, LspAdapterDelegate,
    OffsetRangeExt, ToOffset,
 };
 use project::{DiagnosticSummary, PathMatchCandidateSet, Project};
@@ -367,7 +367,7 @@ pub fn collect_buffer_diagnostics(

 fn collect_diagnostic(
    output: &mut SlashCommandOutput,
-    entry: &DiagnosticEntryRef<'_, Anchor>,
+    entry: &DiagnosticEntry<Anchor>,
    snapshot: &BufferSnapshot,
    include_warnings: bool,
 ) {
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -17,7 +17,7 @@ use editor::{
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
-    TextStyleRefinement, WeakEntity, pulsating_between,
+    TextStyleRefinement, WeakEntity, pulsating_between, px,
 };
 use indoc::formatdoc;
 use language::{
@@ -1003,7 +1003,7 @@ impl ToolCard for EditFileToolCard {
                font_size: Some(
                    TextSize::Small
                        .rems(cx)
-                        .to_pixels(ThemeSettings::get_global(cx).agent_ui_font_size(cx))
+                        .to_pixels(ThemeSettings::get_global(cx).agent_font_size(cx))
                        .into(),
                ),
                ..TextStyleRefinement::default()
@@ -1102,7 +1102,7 @@ impl ToolCard for EditFileToolCard {
                    .relative()
                    .h_full()
                    .when(!self.full_height_expanded, |editor_container| {
-                        editor_container.max_h(COLLAPSED_LINES as f32 * editor_line_height)
+                        editor_container.max_h(px(COLLAPSED_LINES as f32 * editor_line_height.0))
                    })
                    .overflow_hidden()
                    .border_t_1()
@@ -1161,7 +1161,7 @@ async fn build_buffer(
    LineEnding::normalize(&mut text);
    let text = Rope::from(text);
    let language = cx
-        .update(|_cx| language_registry.load_language_for_file_path(&path))?
+        .update(|_cx| language_registry.language_for_file_path(&path))?
        .await
        .ok();
    let buffer = cx.new(|cx| {
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -18,7 +18,7 @@ use portable_pty::{CommandBuilder, PtySize, native_pty_system};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsLocation};
+use settings::Settings;
 use std::{
    env,
    path::{Path, PathBuf},
@@ -27,13 +27,12 @@ use std::{
    time::{Duration, Instant},
 };
 use task::{Shell, ShellBuilder};
-use terminal::terminal_settings::TerminalSettings;
 use terminal_view::TerminalView;
 use theme::ThemeSettings;
 use ui::{CommonAnimationExt, Disclosure, Tooltip, prelude::*};
 use util::{
-    ResultExt, get_default_system_shell_preferring_bash, markdown::MarkdownInlineCode,
-    size::format_file_size, time::duration_alt_display,
+    ResultExt, get_default_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
+    time::duration_alt_display,
 };
 use workspace::Workspace;

@@ -120,30 +119,17 @@ impl Tool for TerminalTool {
        };

        let cwd = working_dir.clone();
-        let env = match &cwd {
+        let env = match &working_dir {
            Some(dir) => project.update(cx, |project, cx| {
-                let worktree = project.find_worktree(dir.as_path(), cx);
-                let shell = TerminalSettings::get(
-                    worktree.as_ref().map(|(worktree, path)| SettingsLocation {
-                        worktree_id: worktree.read(cx).id(),
-                        path: &path,
-                    }),
-                    cx,
-                )
-                .shell
-                .clone();
-                project.directory_environment(&shell, dir.as_path().into(), cx)
+                project.directory_environment(dir.as_path().into(), cx)
            }),
            None => Task::ready(None).shared(),
        };
-        let is_windows = project.read(cx).path_style(cx).is_windows();
-        let shell = project
-            .update(cx, |project, cx| {
-                project
-                    .remote_client()
-                    .and_then(|r| r.read(cx).default_system_shell())
-            })
-            .unwrap_or_else(|| get_default_system_shell_preferring_bash());
+        let remote_shell = project.update(cx, |project, cx| {
+            project
+                .remote_client()
+                .and_then(|r| r.read(cx).default_system_shell())
+        });

        let env = cx.spawn(async move |_| {
            let mut env = env.await.unwrap_or_default();
@@ -156,9 +142,12 @@ impl Tool for TerminalTool {
        let build_cmd = {
            let input_command = input.command.clone();
            move || {
-                ShellBuilder::new(&Shell::Program(shell), is_windows)
-                    .redirect_stdin_to_dev_null()
-                    .build(Some(input_command), &[])
+                ShellBuilder::new(
+                    remote_shell.as_deref(),
+                    &Shell::Program(get_default_system_shell()),
+                )
+                .redirect_stdin_to_dev_null()
+                .build(Some(input_command.clone()), &[])
            }
        };

@@ -487,7 +476,7 @@ impl ToolCard for TerminalToolCard {
            .as_ref()
            .cloned()
            .or_else(|| env::current_dir().ok())
-            .map(|path| path.display().to_string())
+            .map(|path| format!("{}", path.display()))
            .unwrap_or_else(|| "current directory".to_string());

        let header = h_flex()
@@ -705,6 +694,7 @@ mod tests {
    use serde_json::json;
    use settings::{Settings, SettingsStore};
    use terminal::terminal_settings::TerminalSettings;
+    use theme::ThemeSettings;
    use util::{ResultExt as _, test::TempTree};

    use super::*;
@@ -719,7 +709,7 @@ mod tests {
            language::init(cx);
            Project::init_settings(cx);
            workspace::init_settings(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
+            ThemeSettings::register(cx);
            TerminalSettings::register(cx);
            EditorSettings::register(cx);
        });
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,12 +1,12 @@
 use anyhow::{Context as _, Result};
 use collections::HashMap;
 use gpui::{App, BackgroundExecutor, BorrowAppContext, Global};
-use log::info;

 #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
 mod non_windows_and_freebsd_deps {
    pub(super) use gpui::AsyncApp;
    pub(super) use libwebrtc::native::apm;
+    pub(super) use log::info;
    pub(super) use parking_lot::Mutex;
    pub(super) use rodio::cpal::Sample;
    pub(super) use rodio::source::LimitSettings;
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -42,7 +42,7 @@ pub struct AudioSettings {

 /// Configuration of audio in Zed
 impl Settings for AudioSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
        let audio = &content.audio.as_ref().unwrap();
        AudioSettings {
            rodio_audio: audio.rodio_audio.unwrap(),
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -127,7 +127,7 @@ struct AutoUpdateSetting(bool);
 ///
 /// Default: true
 impl Settings for AutoUpdateSetting {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
        Self(content.auto_update.unwrap())
    }
 }
@@ -649,7 +649,7 @@ impl AutoUpdater {
        #[cfg(not(target_os = "windows"))]
        anyhow::ensure!(
            which::which("rsync").is_ok(),
-            "Could not auto-update because the required rsync utility was not found."
+            "Aborting. Could not find rsync which is required for auto-updates."
        );
        Ok(())
    }
@@ -658,7 +658,7 @@ impl AutoUpdater {
        let filename = match OS {
            "macos" => anyhow::Ok("Zed.dmg"),
            "linux" => Ok("zed.tar.gz"),
-            "windows" => Ok("Zed.exe"),
+            "windows" => Ok("zed_editor_installer.exe"),
            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
        }?;

--- a/crates/auto_update_helper/src/updater.rs
+++ b/crates/auto_update_helper/src/updater.rs
@@ -1,4 +1,5 @@
 use std::{
+    os::windows::process::CommandExt,
    path::Path,
    time::{Duration, Instant},
 };
@@ -6,6 +7,7 @@ use std::{
 use anyhow::{Context as _, Result};
 use windows::Win32::{
    Foundation::{HWND, LPARAM, WPARAM},
+    System::Threading::CREATE_NEW_PROCESS_GROUP,
    UI::WindowsAndMessaging::PostMessageW,
 };

@@ -36,20 +38,6 @@ pub(crate) const JOBS: &[Job] = &[
        std::fs::remove_file(&zed_wsl)
            .context(format!("Failed to remove old file {}", zed_wsl.display()))
    },
-    |app_dir| {
-        let open_console = app_dir.join("OpenConsole.exe");
-        log::info!("Removing old file: {}", open_console.display());
-        std::fs::remove_file(&open_console).context(format!(
-            "Failed to remove old file {}",
-            open_console.display()
-        ))
-    },
-    |app_dir| {
-        let conpty = app_dir.join("conpty.dll");
-        log::info!("Removing old file: {}", conpty.display());
-        std::fs::remove_file(&conpty)
-            .context(format!("Failed to remove old file {}", conpty.display()))
-    },
    // Copy new files
    |app_dir| {
        let zed_executable_source = app_dir.join("install\\Zed.exe");
@@ -99,38 +87,6 @@ pub(crate) const JOBS: &[Job] = &[
                zed_wsl_dest.display()
            ))
    },
-    |app_dir| {
-        let open_console_source = app_dir.join("install\\OpenConsole.exe");
-        let open_console_dest = app_dir.join("OpenConsole.exe");
-        log::info!(
-            "Copying new file {} to {}",
-            open_console_source.display(),
-            open_console_dest.display()
-        );
-        std::fs::copy(&open_console_source, &open_console_dest)
-            .map(|_| ())
-            .context(format!(
-                "Failed to copy new file {} to {}",
-                open_console_source.display(),
-                open_console_dest.display()
-            ))
-    },
-    |app_dir| {
-        let conpty_source = app_dir.join("install\\conpty.dll");
-        let conpty_dest = app_dir.join("conpty.dll");
-        log::info!(
-            "Copying new file {} to {}",
-            conpty_source.display(),
-            conpty_dest.display()
-        );
-        std::fs::copy(&conpty_source, &conpty_dest)
-            .map(|_| ())
-            .context(format!(
-                "Failed to copy new file {} to {}",
-                conpty_source.display(),
-                conpty_dest.display()
-            ))
-    },
    // Clean up installer folder and updates folder
    |app_dir| {
        let updates_folder = app_dir.join("updates");
@@ -205,7 +161,9 @@ pub(crate) fn perform_update(app_dir: &Path, hwnd: Option<isize>, launch: bool)
    }
    if launch {
        #[allow(clippy::disallowed_methods, reason = "doesn't run in the main binary")]
-        let _ = std::process::Command::new(app_dir.join("Zed.exe")).spawn();
+        let _ = std::process::Command::new(app_dir.join("Zed.exe"))
+            .creation_flags(CREATE_NEW_PROCESS_GROUP.0)
+            .spawn();
    }
    log::info!("Update completed successfully");
    Ok(())
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -1,3 +1,4 @@
+use gpui::App;
 use settings::Settings;

 #[derive(Debug)]
@@ -7,11 +8,17 @@ pub struct CallSettings {
 }

 impl Settings for CallSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
        let call = content.calls.clone().unwrap();
        CallSettings {
            mute_on_join: call.mute_on_join.unwrap(),
            share_on_join: call.share_on_join.unwrap(),
        }
    }
+
+    fn import_from_vscode(
+        _vscode: &settings::VsCodeSettings,
+        _current: &mut settings::SettingsContent,
+    ) {
+    }
 }
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -22,7 +22,6 @@ default = []

 [dependencies]
 anyhow.workspace = true
-askpass.workspace = true
 clap.workspace = true
 collections.workspace = true
 ipc-channel = "0.19"
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -116,11 +116,6 @@ struct Args {
    ))]
    #[arg(long)]
    uninstall: bool,
-
-    /// Used for SSH/Git password authentication, to remove the need for netcat as a dependency,
-    /// by having Zed act like netcat communicating over a Unix socket.
-    #[arg(long, hide = true)]
-    askpass: Option<String>,
 }

 fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
@@ -208,12 +203,6 @@ fn main() -> Result<()> {
    }
    let args = Args::parse();

-    // `zed --askpass` Makes zed operate in nc/netcat mode for use with askpass
-    if let Some(socket) = &args.askpass {
-        askpass::main(socket);
-        return Ok(());
-    }
-
    // Set custom data directory before any path operations
    let user_data_dir = args.user_data_dir.clone();
    if let Some(dir) = &user_data_dir {
@@ -731,15 +720,15 @@ mod windows {
            Storage::FileSystem::{
                CreateFileW, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_MODE, OPEN_EXISTING, WriteFile,
            },
-            System::Threading::CreateMutexW,
+            System::Threading::{CREATE_NEW_PROCESS_GROUP, CreateMutexW},
        },
        core::HSTRING,
    };

    use crate::{Detect, InstalledApp};
-    use std::io;
    use std::path::{Path, PathBuf};
    use std::process::ExitStatus;
+    use std::{io, os::windows::process::CommandExt};

    fn check_single_instance() -> bool {
        let mutex = unsafe {
@@ -778,6 +767,7 @@ mod windows {
        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
            if check_single_instance() {
                std::process::Command::new(self.0.clone())
+                    .creation_flags(CREATE_NEW_PROCESS_GROUP.0)
                    .arg(ipc_url)
                    .spawn()?;
            } else {
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -101,7 +101,7 @@ pub struct ClientSettings {
 }

 impl Settings for ClientSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
        if let Some(server_url) = &*ZED_SERVER_URL {
            return Self {
                server_url: server_url.clone(),
@@ -133,7 +133,7 @@ impl ProxySettings {
 }

 impl Settings for ProxySettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
        Self {
            proxy: content.proxy.clone(),
        }
@@ -519,7 +519,7 @@ pub struct TelemetrySettings {
 }

 impl settings::Settings for TelemetrySettings {
-    fn from_settings(content: &SettingsContent) -> Self {
+    fn from_settings(content: &SettingsContent, _cx: &mut App) -> Self {
        Self {
            diagnostics: content.telemetry.as_ref().unwrap().diagnostics.unwrap(),
            metrics: content.telemetry.as_ref().unwrap().metrics.unwrap(),
--- a/crates/cloud_llm_client/src/predict_edits_v3.rs
+++ b/crates/cloud_llm_client/src/predict_edits_v3.rs
@@ -127,6 +127,7 @@ pub struct DeclarationScoreComponents {
    pub declaration_count: usize,
    pub reference_line_distance: u32,
    pub declaration_line_distance: u32,
+    pub declaration_line_distance_rank: usize,
    pub excerpt_vs_item_jaccard: f32,
    pub excerpt_vs_signature_jaccard: f32,
    pub adjacent_vs_item_jaccard: f32,
@@ -135,15 +136,6 @@ pub struct DeclarationScoreComponents {
    pub excerpt_vs_signature_weighted_overlap: f32,
    pub adjacent_vs_item_weighted_overlap: f32,
    pub adjacent_vs_signature_weighted_overlap: f32,
-    pub path_import_match_count: usize,
-    pub wildcard_path_import_match_count: usize,
-    pub import_similarity: f32,
-    pub max_import_similarity: f32,
-    pub normalized_import_similarity: f32,
-    pub wildcard_import_similarity: f32,
-    pub normalized_wildcard_import_similarity: f32,
-    pub included_by_others: usize,
-    pub includes_others: usize,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
--- a/crates/cloud_zeta2_prompt/Cargo.toml
+++ b/crates/cloud_zeta2_prompt/Cargo.toml
@@ -17,6 +17,5 @@ cloud_llm_client.workspace = true
 indoc.workspace = true
 ordered-float.workspace = true
 rustc-hash.workspace = true
-serde.workspace = true
 strum.workspace = true
 workspace-hack.workspace = true
--- a/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
+++ b/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
@@ -5,7 +5,6 @@ use cloud_llm_client::predict_edits_v3::{self, Event, PromptFormat, ReferencedDe
 use indoc::indoc;
 use ordered_float::OrderedFloat;
 use rustc_hash::{FxHashMap, FxHashSet};
-use serde::Serialize;
 use std::fmt::Write;
 use std::sync::Arc;
 use std::{cmp::Reverse, collections::BinaryHeap, ops::Range, path::Path};
@@ -76,7 +75,7 @@ pub enum DeclarationStyle {
    Declaration,
 }

-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug)]
 pub struct SectionLabels {
    pub excerpt_index: usize,
    pub section_ranges: Vec<(Arc<Path>, Range<usize>)>,
--- a/crates/codestral/Cargo.toml
+++ b/crates/codestral/Cargo.toml
@@ -1,28 +0,0 @@
-[package]
-name = "codestral"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/codestral.rs"
-
-[dependencies]
-anyhow.workspace = true
-edit_prediction.workspace = true
-edit_prediction_context.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-language.workspace = true
-language_models.workspace = true
-log.workspace = true
-mistral.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-text.workspace = true
-workspace-hack.workspace = true
-
-[dev-dependencies]
--- a/crates/codestral/LICENSE-GPL
+++ b/crates/codestral/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/codestral/src/codestral.rs
+++ b/crates/codestral/src/codestral.rs
@@ -1,381 +0,0 @@
-use anyhow::{Context as _, Result};
-use edit_prediction::{Direction, EditPrediction, EditPredictionProvider};
-use edit_prediction_context::{EditPredictionExcerpt, EditPredictionExcerptOptions};
-use futures::AsyncReadExt;
-use gpui::{App, Context, Entity, Task};
-use http_client::HttpClient;
-use language::{
-    language_settings::all_language_settings, Anchor, Buffer, BufferSnapshot, EditPreview, ToPoint,
-};
-use language_models::MistralLanguageModelProvider;
-use mistral::CODESTRAL_API_URL;
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::Range,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use text::ToOffset;
-
-pub const DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(150);
-
-const EXCERPT_OPTIONS: EditPredictionExcerptOptions = EditPredictionExcerptOptions {
-    max_bytes: 1050,
-    min_bytes: 525,
-    target_before_cursor_over_total_bytes: 0.66,
-};
-
-/// Represents a completion that has been received and processed from Codestral.
-/// This struct maintains the state needed to interpolate the completion as the user types.
-#[derive(Clone)]
-struct CurrentCompletion {
-    /// The buffer snapshot at the time the completion was generated.
-    /// Used to detect changes and interpolate edits.
-    snapshot: BufferSnapshot,
-    /// The edits that should be applied to transform the original text into the predicted text.
-    /// Each edit is a range in the buffer and the text to replace it with.
-    edits: Arc<[(Range<Anchor>, String)]>,
-    /// Preview of how the buffer will look after applying the edits.
-    edit_preview: EditPreview,
-}
-
-impl CurrentCompletion {
-    /// Attempts to adjust the edits based on changes made to the buffer since the completion was generated.
-    /// Returns None if the user's edits conflict with the predicted edits.
-    fn interpolate(&self, new_snapshot: &BufferSnapshot) -> Option<Vec<(Range<Anchor>, String)>> {
-        edit_prediction::interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
-    }
-}
-
-pub struct CodestralCompletionProvider {
-    http_client: Arc<dyn HttpClient>,
-    pending_request: Option<Task<Result<()>>>,
-    current_completion: Option<CurrentCompletion>,
-}
-
-impl CodestralCompletionProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>) -> Self {
-        Self {
-            http_client,
-            pending_request: None,
-            current_completion: None,
-        }
-    }
-
-    pub fn has_api_key(cx: &App) -> bool {
-        Self::api_key(cx).is_some()
-    }
-
-    fn api_key(cx: &App) -> Option<Arc<str>> {
-        MistralLanguageModelProvider::try_global(cx)
-            .and_then(|provider| provider.codestral_api_key(CODESTRAL_API_URL, cx))
-    }
-
-    /// Uses Codestral's Fill-in-the-Middle API for code completion.
-    async fn fetch_completion(
-        http_client: Arc<dyn HttpClient>,
-        api_key: &str,
-        prompt: String,
-        suffix: String,
-        model: String,
-        max_tokens: Option<u32>,
-    ) -> Result<String> {
-        let start_time = Instant::now();
-
-        log::debug!(
-            "Codestral: Requesting completion (model: {}, max_tokens: {:?})",
-            model,
-            max_tokens
-        );
-
-        let request = CodestralRequest {
-            model,
-            prompt,
-            suffix: if suffix.is_empty() {
-                None
-            } else {
-                Some(suffix)
-            },
-            max_tokens: max_tokens.or(Some(350)),
-            temperature: Some(0.2),
-            top_p: Some(1.0),
-            stream: Some(false),
-            stop: None,
-            random_seed: None,
-            min_tokens: None,
-        };
-
-        let request_body = serde_json::to_string(&request)?;
-
-        log::debug!("Codestral: Sending FIM request");
-
-        let http_request = http_client::Request::builder()
-            .method(http_client::Method::POST)
-            .uri(format!("{}/v1/fim/completions", CODESTRAL_API_URL))
-            .header("Content-Type", "application/json")
-            .header("Authorization", format!("Bearer {}", api_key))
-            .body(http_client::AsyncBody::from(request_body))?;
-
-        let mut response = http_client.send(http_request).await?;
-        let status = response.status();
-
-        log::debug!("Codestral: Response status: {}", status);
-
-        if !status.is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-            return Err(anyhow::anyhow!(
-                "Codestral API error: {} - {}",
-                status,
-                body
-            ));
-        }
-
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        let codestral_response: CodestralResponse = serde_json::from_str(&body)?;
-
-        let elapsed = start_time.elapsed();
-
-        if let Some(choice) = codestral_response.choices.first() {
-            let completion = &choice.message.content;
-
-            log::debug!(
-                "Codestral: Completion received ({} tokens, {:.2}s)",
-                codestral_response.usage.completion_tokens,
-                elapsed.as_secs_f64()
-            );
-
-            // Return just the completion text for insertion at cursor
-            Ok(completion.clone())
-        } else {
-            log::error!("Codestral: No completion returned in response");
-            Err(anyhow::anyhow!("No completion returned from Codestral"))
-        }
-    }
-}
-
-impl EditPredictionProvider for CodestralCompletionProvider {
-    fn name() -> &'static str {
-        "codestral"
-    }
-
-    fn display_name() -> &'static str {
-        "Codestral"
-    }
-
-    fn show_completions_in_menu() -> bool {
-        true
-    }
-
-    fn is_enabled(&self, _buffer: &Entity<Buffer>, _cursor_position: Anchor, cx: &App) -> bool {
-        Self::api_key(cx).is_some()
-    }
-
-    fn is_refreshing(&self) -> bool {
-        self.pending_request.is_some()
-    }
-
-    fn refresh(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        debounce: bool,
-        cx: &mut Context<Self>,
-    ) {
-        log::debug!("Codestral: Refresh called (debounce: {})", debounce);
-
-        let Some(api_key) = Self::api_key(cx) else {
-            log::warn!("Codestral: No API key configured, skipping refresh");
-            return;
-        };
-
-        let snapshot = buffer.read(cx).snapshot();
-
-        // Check if current completion is still valid
-        if let Some(current_completion) = self.current_completion.as_ref() {
-            if current_completion.interpolate(&snapshot).is_some() {
-                return;
-            }
-        }
-
-        let http_client = self.http_client.clone();
-
-        // Get settings
-        let settings = all_language_settings(None, cx);
-        let model = settings
-            .edit_predictions
-            .codestral
-            .model
-            .clone()
-            .unwrap_or_else(|| "codestral-latest".to_string());
-        let max_tokens = settings.edit_predictions.codestral.max_tokens;
-
-        self.pending_request = Some(cx.spawn(async move |this, cx| {
-            if debounce {
-                log::debug!("Codestral: Debouncing for {:?}", DEBOUNCE_TIMEOUT);
-                smol::Timer::after(DEBOUNCE_TIMEOUT).await;
-            }
-
-            let cursor_offset = cursor_position.to_offset(&snapshot);
-            let cursor_point = cursor_offset.to_point(&snapshot);
-            let excerpt = EditPredictionExcerpt::select_from_buffer(
-                cursor_point,
-                &snapshot,
-                &EXCERPT_OPTIONS,
-                None,
-            )
-            .context("Line containing cursor doesn't fit in excerpt max bytes")?;
-
-            let excerpt_text = excerpt.text(&snapshot);
-            let cursor_within_excerpt = cursor_offset
-                .saturating_sub(excerpt.range.start)
-                .min(excerpt_text.body.len());
-            let prompt = excerpt_text.body[..cursor_within_excerpt].to_string();
-            let suffix = excerpt_text.body[cursor_within_excerpt..].to_string();
-
-            let completion_text = match Self::fetch_completion(
-                http_client,
-                &api_key,
-                prompt,
-                suffix,
-                model,
-                max_tokens,
-            )
-            .await
-            {
-                Ok(completion) => completion,
-                Err(e) => {
-                    log::error!("Codestral: Failed to fetch completion: {}", e);
-                    this.update(cx, |this, cx| {
-                        this.pending_request = None;
-                        cx.notify();
-                    })?;
-                    return Err(e);
-                }
-            };
-
-            if completion_text.trim().is_empty() {
-                log::debug!("Codestral: Completion was empty after trimming; ignoring");
-                this.update(cx, |this, cx| {
-                    this.pending_request = None;
-                    cx.notify();
-                })?;
-                return Ok(());
-            }
-
-            let edits: Arc<[(Range<Anchor>, String)]> =
-                vec![(cursor_position..cursor_position, completion_text)].into();
-            let edit_preview = buffer
-                .read_with(cx, |buffer, cx| buffer.preview_edits(edits.clone(), cx))?
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.current_completion = Some(CurrentCompletion {
-                    snapshot,
-                    edits,
-                    edit_preview,
-                });
-                this.pending_request = None;
-                cx.notify();
-            })?;
-
-            Ok(())
-        }));
-    }
-
-    fn cycle(
-        &mut self,
-        _buffer: Entity<Buffer>,
-        _cursor_position: Anchor,
-        _direction: Direction,
-        _cx: &mut Context<Self>,
-    ) {
-        // Codestral doesn't support multiple completions, so cycling does nothing
-    }
-
-    fn accept(&mut self, _cx: &mut Context<Self>) {
-        log::debug!("Codestral: Completion accepted");
-        self.pending_request = None;
-        self.current_completion = None;
-    }
-
-    fn discard(&mut self, _cx: &mut Context<Self>) {
-        log::debug!("Codestral: Completion discarded");
-        self.pending_request = None;
-        self.current_completion = None;
-    }
-
-    /// Returns the completion suggestion, adjusted or invalidated based on user edits
-    fn suggest(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        _cursor_position: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<EditPrediction> {
-        let current_completion = self.current_completion.as_ref()?;
-        let buffer = buffer.read(cx);
-        let edits = current_completion.interpolate(&buffer.snapshot())?;
-        if edits.is_empty() {
-            return None;
-        }
-        Some(EditPrediction::Local {
-            id: None,
-            edits,
-            edit_preview: Some(current_completion.edit_preview.clone()),
-        })
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CodestralRequest {
-    pub model: String,
-    pub prompt: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub suffix: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_tokens: Option<u32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub top_p: Option<f32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stream: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stop: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub random_seed: Option<u32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub min_tokens: Option<u32>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct CodestralResponse {
-    pub id: String,
-    pub object: String,
-    pub model: String,
-    pub usage: Usage,
-    pub created: u64,
-    pub choices: Vec<Choice>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Usage {
-    pub prompt_tokens: u32,
-    pub completion_tokens: u32,
-    pub total_tokens: u32,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Choice {
-    pub index: u32,
-    pub message: Message,
-    pub finish_reason: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Message {
-    pub content: String,
-    pub role: String,
-}
--- a/crates/collab/.env.toml
+++ b/crates/collab/.env.toml
@@ -20,5 +20,7 @@ LLM_DATABASE_MAX_CONNECTIONS = 5
 LLM_API_SECRET = "llm-secret"
 OPENAI_API_KEY = "llm-secret"

+# SLACK_PANICS_WEBHOOK = ""
+
 # RUST_LOG=info
 # LOG_JSON=true
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -46,6 +46,7 @@ rand.workspace = true
 reqwest = { version = "0.11", features = ["json"] }
 reqwest_client.workspace = true
 rpc.workspace = true
+rustc-demangle.workspace = true
 scrypt = "0.11"
 sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 semantic_version.workspace = true
--- a/crates/collab/k8s/collab.template.yml
+++ b/crates/collab/k8s/collab.template.yml
@@ -214,6 +214,11 @@ spec:
                secretKeyRef:
                  name: blob-store
                  key: bucket
+            - name: SLACK_PANICS_WEBHOOK
+              valueFrom:
+                secretKeyRef:
+                  name: slack
+                  key: panics_webhook
            - name: COMPLETE_WITH_LANGUAGE_MODEL_RATE_LIMIT_PER_HOUR
              value: "1000"
            - name: SUPERMAVEN_ADMIN_API_KEY
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -97,7 +97,6 @@ CREATE TABLE "worktree_entries" (
    "is_external" BOOL NOT NULL,
    "is_ignored" BOOL NOT NULL,
    "is_deleted" BOOL NOT NULL,
-    "is_hidden" BOOL NOT NULL,
    "git_status" INTEGER,
    "is_fifo" BOOL NOT NULL,
    PRIMARY KEY (project_id, worktree_id, id),
--- a/crates/collab/migrations/20251002214229_add_token_spend_in_cents_to_billing_subscriptions.sql
+++ b/crates/collab/migrations/20251002214229_add_token_spend_in_cents_to_billing_subscriptions.sql
@@ -1,3 +0,0 @@
-alter table billing_subscriptions
-    add column token_spend_in_cents integer,
-    add column token_spend_in_cents_updated_at timestamp without time zone;
--- a/crates/collab/migrations/20251008120000_add_is_hidden_to_worktree_entries.sql
+++ b/crates/collab/migrations/20251008120000_add_is_hidden_to_worktree_entries.sql
@@ -1,2 +0,0 @@
-ALTER TABLE "worktree_entries"
-ADD "is_hidden" BOOL NOT NULL DEFAULT FALSE;
--- a/crates/collab/src/api.rs
+++ b/crates/collab/src/api.rs
@@ -1,6 +1,8 @@
 pub mod contributors;
 pub mod events;
 pub mod extensions;
+pub mod ips_file;
+pub mod slack;

 use crate::{AppState, Error, Result, auth, db::UserId, rpc};
 use anyhow::Context as _;
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -1,28 +1,33 @@
+use super::ips_file::IpsFile;
 use crate::api::CloudflareIpCountryHeader;
-use crate::{AppState, Error, Result};
+use crate::{AppState, Error, Result, api::slack};
 use anyhow::anyhow;
+use aws_sdk_s3::primitives::ByteStream;
 use axum::{
    Extension, Router, TypedHeader,
    body::Bytes,
    headers::Header,
-    http::{HeaderName, StatusCode},
+    http::{HeaderMap, HeaderName, StatusCode},
    routing::post,
 };
 use chrono::Duration;
+use semantic_version::SemanticVersion;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sha2::{Digest, Sha256};
 use std::sync::{Arc, OnceLock};
-use telemetry_events::{Event, EventRequestBody};
+use telemetry_events::{Event, EventRequestBody, Panic};
 use util::ResultExt;
 use uuid::Uuid;

+const CRASH_REPORTS_BUCKET: &str = "zed-crash-reports";
+
 pub fn router() -> Router {
    Router::new()
        .route("/telemetry/events", post(post_events))
-        .route("/telemetry/crashes", post(post_panic))
+        .route("/telemetry/crashes", post(post_crash))
        .route("/telemetry/panics", post(post_panic))
-        .route("/telemetry/hangs", post(post_panic))
+        .route("/telemetry/hangs", post(post_hang))
 }

 pub struct ZedChecksumHeader(Vec<u8>);
@@ -53,12 +58,437 @@ impl Header for ZedChecksumHeader {
    }
 }

-pub async fn post_panic() -> Result<()> {
-    // as of v0.201.x crash/panic reporting is now done via Sentry.
-    // The endpoint returns OK to avoid spurious errors for old clients.
+pub async fn post_crash(
+    Extension(app): Extension<Arc<AppState>>,
+    headers: HeaderMap,
+    body: Bytes,
+) -> Result<()> {
+    let report = IpsFile::parse(&body)?;
+    let version_threshold = SemanticVersion::new(0, 123, 0);
+
+    let bundle_id = &report.header.bundle_id;
+    let app_version = &report.app_version();
+
+    if bundle_id == "dev.zed.Zed-Dev" {
+        log::error!("Crash uploads from {} are ignored.", bundle_id);
+        return Ok(());
+    }
+
+    if app_version.is_none() || app_version.unwrap() < version_threshold {
+        log::error!(
+            "Crash uploads from {} are ignored.",
+            report.header.app_version
+        );
+        return Ok(());
+    }
+    let app_version = app_version.unwrap();
+
+    if let Some(blob_store_client) = app.blob_store_client.as_ref() {
+        let response = blob_store_client
+            .head_object()
+            .bucket(CRASH_REPORTS_BUCKET)
+            .key(report.header.incident_id.clone() + ".ips")
+            .send()
+            .await;
+
+        if response.is_ok() {
+            log::info!("We've already uploaded this crash");
+            return Ok(());
+        }
+
+        blob_store_client
+            .put_object()
+            .bucket(CRASH_REPORTS_BUCKET)
+            .key(report.header.incident_id.clone() + ".ips")
+            .acl(aws_sdk_s3::types::ObjectCannedAcl::PublicRead)
+            .body(ByteStream::from(body.to_vec()))
+            .send()
+            .await
+            .map_err(|e| log::error!("Failed to upload crash: {}", e))
+            .ok();
+    }
+
+    let recent_panic_on: Option<i64> = headers
+        .get("x-zed-panicked-on")
+        .and_then(|h| h.to_str().ok())
+        .and_then(|s| s.parse().ok());
+
+    let installation_id = headers
+        .get("x-zed-installation-id")
+        .and_then(|h| h.to_str().ok())
+        .map(|s| s.to_string())
+        .unwrap_or_default();
+
+    let mut recent_panic = None;
+
+    if let Some(recent_panic_on) = recent_panic_on {
+        let crashed_at = match report.timestamp() {
+            Ok(t) => Some(t),
+            Err(e) => {
+                log::error!("Can't parse {}: {}", report.header.timestamp, e);
+                None
+            }
+        };
+        if crashed_at.is_some_and(|t| (t.timestamp_millis() - recent_panic_on).abs() <= 30000) {
+            recent_panic = headers.get("x-zed-panic").and_then(|h| h.to_str().ok());
+        }
+    }
+
+    let description = report.description(recent_panic);
+    let summary = report.backtrace_summary();
+
+    tracing::error!(
+        service = "client",
+        version = %report.header.app_version,
+        os_version = %report.header.os_version,
+        bundle_id = %report.header.bundle_id,
+        incident_id = %report.header.incident_id,
+        installation_id = %installation_id,
+        description = %description,
+        backtrace = %summary,
+        "crash report"
+    );
+
+    if let Some(kinesis_client) = app.kinesis_client.clone()
+        && let Some(stream) = app.config.kinesis_stream.clone()
+    {
+        let properties = json!({
+            "app_version": report.header.app_version,
+            "os_version": report.header.os_version,
+            "os_name": "macOS",
+            "bundle_id": report.header.bundle_id,
+            "incident_id": report.header.incident_id,
+            "installation_id": installation_id,
+            "description": description,
+            "backtrace": summary,
+        });
+        let row = SnowflakeRow::new(
+            "Crash Reported",
+            None,
+            false,
+            Some(installation_id),
+            properties,
+        );
+        let data = serde_json::to_vec(&row)?;
+        kinesis_client
+            .put_record()
+            .stream_name(stream)
+            .partition_key(row.insert_id.unwrap_or_default())
+            .data(data.into())
+            .send()
+            .await
+            .log_err();
+    }
+
+    if let Some(slack_panics_webhook) = app.config.slack_panics_webhook.clone() {
+        let payload = slack::WebhookBody::new(|w| {
+            w.add_section(|s| s.text(slack::Text::markdown(description)))
+                .add_section(|s| {
+                    s.add_field(slack::Text::markdown(format!(
+                        "*Version:*\n{} ({})",
+                        bundle_id, app_version
+                    )))
+                    .add_field({
+                        let hostname = app.config.blob_store_url.clone().unwrap_or_default();
+                        let hostname = hostname.strip_prefix("https://").unwrap_or_else(|| {
+                            hostname.strip_prefix("http://").unwrap_or_default()
+                        });
+
+                        slack::Text::markdown(format!(
+                            "*Incident:*\n<https://{}.{}/{}.ips|{}…>",
+                            CRASH_REPORTS_BUCKET,
+                            hostname,
+                            report.header.incident_id,
+                            report
+                                .header
+                                .incident_id
+                                .chars()
+                                .take(8)
+                                .collect::<String>(),
+                        ))
+                    })
+                })
+                .add_rich_text(|r| r.add_preformatted(|p| p.add_text(summary)))
+        });
+        let payload_json = serde_json::to_string(&payload).map_err(|err| {
+            log::error!("Failed to serialize payload to JSON: {err}");
+            Error::Internal(anyhow!(err))
+        })?;
+
+        reqwest::Client::new()
+            .post(slack_panics_webhook)
+            .header("Content-Type", "application/json")
+            .body(payload_json)
+            .send()
+            .await
+            .map_err(|err| {
+                log::error!("Failed to send payload to Slack: {err}");
+                Error::Internal(anyhow!(err))
+            })?;
+    }
+
    Ok(())
 }

+pub async fn post_hang(
+    Extension(app): Extension<Arc<AppState>>,
+    TypedHeader(ZedChecksumHeader(checksum)): TypedHeader<ZedChecksumHeader>,
+    body: Bytes,
+) -> Result<()> {
+    let Some(expected) = calculate_json_checksum(app.clone(), &body) else {
+        return Err(Error::http(
+            StatusCode::INTERNAL_SERVER_ERROR,
+            "events not enabled".into(),
+        ))?;
+    };
+
+    if checksum != expected {
+        return Err(Error::http(
+            StatusCode::BAD_REQUEST,
+            "invalid checksum".into(),
+        ))?;
+    }
+
+    let incident_id = Uuid::new_v4().to_string();
+
+    // dump JSON into S3 so we can get frame offsets if we need to.
+    if let Some(blob_store_client) = app.blob_store_client.as_ref() {
+        blob_store_client
+            .put_object()
+            .bucket(CRASH_REPORTS_BUCKET)
+            .key(incident_id.clone() + ".hang.json")
+            .acl(aws_sdk_s3::types::ObjectCannedAcl::PublicRead)
+            .body(ByteStream::from(body.to_vec()))
+            .send()
+            .await
+            .map_err(|e| log::error!("Failed to upload crash: {}", e))
+            .ok();
+    }
+
+    let report: telemetry_events::HangReport = serde_json::from_slice(&body).map_err(|err| {
+        log::error!("can't parse report json: {err}");
+        Error::Internal(anyhow!(err))
+    })?;
+
+    let mut backtrace = "Possible hang detected on main thread:".to_string();
+    let unknown = "<unknown>".to_string();
+    for frame in report.backtrace.iter() {
+        backtrace.push_str(&format!("\n{}", frame.symbols.first().unwrap_or(&unknown)));
+    }
+
+    tracing::error!(
+        service = "client",
+        version = %report.app_version.unwrap_or_default().to_string(),
+        os_name = %report.os_name,
+        os_version = report.os_version.unwrap_or_default(),
+        incident_id = %incident_id,
+        installation_id = %report.installation_id.unwrap_or_default(),
+        backtrace = %backtrace,
+        "hang report");
+
+    Ok(())
+}
+
+pub async fn post_panic(
+    Extension(app): Extension<Arc<AppState>>,
+    TypedHeader(ZedChecksumHeader(checksum)): TypedHeader<ZedChecksumHeader>,
+    body: Bytes,
+) -> Result<()> {
+    let Some(expected) = calculate_json_checksum(app.clone(), &body) else {
+        return Err(Error::http(
+            StatusCode::INTERNAL_SERVER_ERROR,
+            "events not enabled".into(),
+        ))?;
+    };
+
+    if checksum != expected {
+        return Err(Error::http(
+            StatusCode::BAD_REQUEST,
+            "invalid checksum".into(),
+        ))?;
+    }
+
+    let report: telemetry_events::PanicRequest = serde_json::from_slice(&body)
+        .map_err(|_| Error::http(StatusCode::BAD_REQUEST, "invalid json".into()))?;
+    let incident_id = uuid::Uuid::new_v4().to_string();
+    let panic = report.panic;
+
+    if panic.os_name == "Linux" && panic.os_version == Some("1.0.0".to_string()) {
+        return Err(Error::http(
+            StatusCode::BAD_REQUEST,
+            "invalid os version".into(),
+        ))?;
+    }
+
+    if let Some(blob_store_client) = app.blob_store_client.as_ref() {
+        let response = blob_store_client
+            .head_object()
+            .bucket(CRASH_REPORTS_BUCKET)
+            .key(incident_id.clone() + ".json")
+            .send()
+            .await;
+
+        if response.is_ok() {
+            log::info!("We've already uploaded this crash");
+            return Ok(());
+        }
+
+        blob_store_client
+            .put_object()
+            .bucket(CRASH_REPORTS_BUCKET)
+            .key(incident_id.clone() + ".json")
+            .acl(aws_sdk_s3::types::ObjectCannedAcl::PublicRead)
+            .body(ByteStream::from(body.to_vec()))
+            .send()
+            .await
+            .map_err(|e| log::error!("Failed to upload crash: {}", e))
+            .ok();
+    }
+
+    let backtrace = panic.backtrace.join("\n");
+
+    tracing::error!(
+        service = "client",
+        version = %panic.app_version,
+        os_name = %panic.os_name,
+        os_version = %panic.os_version.clone().unwrap_or_default(),
+        incident_id = %incident_id,
+        installation_id = %panic.installation_id.clone().unwrap_or_default(),
+        description = %panic.payload,
+        backtrace = %backtrace,
+        "panic report"
+    );
+
+    if let Some(kinesis_client) = app.kinesis_client.clone()
+        && let Some(stream) = app.config.kinesis_stream.clone()
+    {
+        let properties = json!({
+            "app_version": panic.app_version,
+            "os_name": panic.os_name,
+            "os_version": panic.os_version,
+            "incident_id": incident_id,
+            "installation_id": panic.installation_id,
+            "description": panic.payload,
+            "backtrace": backtrace,
+        });
+        let row = SnowflakeRow::new(
+            "Panic Reported",
+            None,
+            false,
+            panic.installation_id.clone(),
+            properties,
+        );
+        let data = serde_json::to_vec(&row)?;
+        kinesis_client
+            .put_record()
+            .stream_name(stream)
+            .partition_key(row.insert_id.unwrap_or_default())
+            .data(data.into())
+            .send()
+            .await
+            .log_err();
+    }
+
+    if !report_to_slack(&panic) {
+        return Ok(());
+    }
+
+    if let Some(slack_panics_webhook) = app.config.slack_panics_webhook.clone() {
+        let backtrace = if panic.backtrace.len() > 25 {
+            let total = panic.backtrace.len();
+            format!(
+                "{}\n   and {} more",
+                panic
+                    .backtrace
+                    .iter()
+                    .take(20)
+                    .cloned()
+                    .collect::<Vec<_>>()
+                    .join("\n"),
+                total - 20
+            )
+        } else {
+            panic.backtrace.join("\n")
+        };
+        let backtrace_with_summary = panic.payload + "\n" + &backtrace;
+
+        let version = if panic.release_channel == "nightly"
+            && !panic.app_version.contains("remote-server")
+            && let Some(sha) = panic.app_commit_sha
+        {
+            format!("Zed Nightly {}", sha.chars().take(7).collect::<String>())
+        } else {
+            panic.app_version
+        };
+
+        let payload = slack::WebhookBody::new(|w| {
+            w.add_section(|s| s.text(slack::Text::markdown("Panic request".to_string())))
+                .add_section(|s| {
+                    s.add_field(slack::Text::markdown(format!("*Version:*\n {version} ",)))
+                        .add_field({
+                            let hostname = app.config.blob_store_url.clone().unwrap_or_default();
+                            let hostname = hostname.strip_prefix("https://").unwrap_or_else(|| {
+                                hostname.strip_prefix("http://").unwrap_or_default()
+                            });
+
+                            slack::Text::markdown(format!(
+                                "*{} {}:*\n<https://{}.{}/{}.json|{}…>",
+                                panic.os_name,
+                                panic.os_version.unwrap_or_default(),
+                                CRASH_REPORTS_BUCKET,
+                                hostname,
+                                incident_id,
+                                incident_id.chars().take(8).collect::<String>(),
+                            ))
+                        })
+                })
+                .add_rich_text(|r| r.add_preformatted(|p| p.add_text(backtrace_with_summary)))
+        });
+        let payload_json = serde_json::to_string(&payload).map_err(|err| {
+            log::error!("Failed to serialize payload to JSON: {err}");
+            Error::Internal(anyhow!(err))
+        })?;
+
+        reqwest::Client::new()
+            .post(slack_panics_webhook)
+            .header("Content-Type", "application/json")
+            .body(payload_json)
+            .send()
+            .await
+            .map_err(|err| {
+                log::error!("Failed to send payload to Slack: {err}");
+                Error::Internal(anyhow!(err))
+            })?;
+    }
+
+    Ok(())
+}
+
+fn report_to_slack(panic: &Panic) -> bool {
+    // Panics on macOS should make their way to Slack as a crash report,
+    // so we don't need to send them a second time via this channel.
+    if panic.os_name == "macOS" {
+        return false;
+    }
+
+    if panic.payload.contains("ERROR_SURFACE_LOST_KHR") {
+        return false;
+    }
+
+    if panic.payload.contains("ERROR_INITIALIZATION_FAILED") {
+        return false;
+    }
+
+    if panic
+        .payload
+        .contains("GPU has crashed, and no debug information is available")
+    {
+        return false;
+    }
+
+    true
+}
+
 pub async fn post_events(
    Extension(app): Extension<Arc<AppState>>,
    TypedHeader(ZedChecksumHeader(checksum)): TypedHeader<ZedChecksumHeader>,
--- a/crates/collab/src/api/ips_file.rs
+++ b/crates/collab/src/api/ips_file.rs
@@ -0,0 +1,346 @@
+use anyhow::Context as _;
+use collections::HashMap;
+
+use semantic_version::SemanticVersion;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+#[derive(Debug)]
+pub struct IpsFile {
+    pub header: Header,
+    pub body: Body,
+}
+
+impl IpsFile {
+    pub fn parse(bytes: &[u8]) -> anyhow::Result<IpsFile> {
+        let mut split = bytes.splitn(2, |&b| b == b'\n');
+        let header_bytes = split.next().context("No header found")?;
+        let header: Header = serde_json::from_slice(header_bytes).context("parsing header")?;
+
+        let body_bytes = split.next().context("No body found")?;
+
+        let body: Body = serde_json::from_slice(body_bytes).context("parsing body")?;
+        Ok(IpsFile { header, body })
+    }
+
+    pub fn faulting_thread(&self) -> Option<&Thread> {
+        self.body.threads.get(self.body.faulting_thread? as usize)
+    }
+
+    pub fn app_version(&self) -> Option<SemanticVersion> {
+        self.header.app_version.parse().ok()
+    }
+
+    pub fn timestamp(&self) -> anyhow::Result<chrono::DateTime<chrono::FixedOffset>> {
+        chrono::DateTime::parse_from_str(&self.header.timestamp, "%Y-%m-%d %H:%M:%S%.f %#z")
+            .map_err(|e| anyhow::anyhow!(e))
+    }
+
+    pub fn description(&self, panic: Option<&str>) -> String {
+        let mut desc = if self.body.termination.indicator == "Abort trap: 6" {
+            match panic {
+                Some(panic_message) => format!("Panic `{}`", panic_message),
+                None => "Crash `Abort trap: 6` (possible panic)".into(),
+            }
+        } else if let Some(msg) = &self.body.exception.message {
+            format!("Exception `{}`", msg)
+        } else {
+            format!("Crash `{}`", self.body.termination.indicator)
+        };
+        if let Some(thread) = self.faulting_thread() {
+            if let Some(queue) = thread.queue.as_ref() {
+                desc += &format!(
+                    " on thread {} ({})",
+                    self.body.faulting_thread.unwrap_or_default(),
+                    queue
+                );
+            } else {
+                desc += &format!(
+                    " on thread {} ({})",
+                    self.body.faulting_thread.unwrap_or_default(),
+                    thread.name.clone().unwrap_or_default()
+                );
+            }
+        }
+        desc
+    }
+
+    pub fn backtrace_summary(&self) -> String {
+        if let Some(thread) = self.faulting_thread() {
+            let mut frames = thread
+                .frames
+                .iter()
+                .filter_map(|frame| {
+                    if let Some(name) = &frame.symbol {
+                        if self.is_ignorable_frame(name) {
+                            return None;
+                        }
+                        Some(format!("{:#}", rustc_demangle::demangle(name)))
+                    } else if let Some(image) = self.body.used_images.get(frame.image_index) {
+                        Some(image.name.clone().unwrap_or("<unknown-image>".into()))
+                    } else {
+                        Some("<unknown>".into())
+                    }
+                })
+                .collect::<Vec<_>>();
+
+            let total = frames.len();
+            if total > 21 {
+                frames = frames.into_iter().take(20).collect();
+                frames.push(format!("  and {} more...", total - 20))
+            }
+            frames.join("\n")
+        } else {
+            "<no backtrace available>".into()
+        }
+    }
+
+    fn is_ignorable_frame(&self, symbol: &String) -> bool {
+        [
+            "pthread_kill",
+            "panic",
+            "backtrace",
+            "rust_begin_unwind",
+            "abort",
+        ]
+        .iter()
+        .any(|s| symbol.contains(s))
+    }
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(default)]
+pub struct Header {
+    pub app_name: String,
+    pub timestamp: String,
+    pub app_version: String,
+    pub slice_uuid: String,
+    pub build_version: String,
+    pub platform: i64,
+    #[serde(rename = "bundleID", default)]
+    pub bundle_id: String,
+    pub share_with_app_devs: i64,
+    pub is_first_party: i64,
+    pub bug_type: String,
+    pub os_version: String,
+    pub roots_installed: i64,
+    pub name: String,
+    pub incident_id: String,
+}
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Body {
+    pub uptime: i64,
+    pub proc_role: String,
+    pub version: i64,
+    #[serde(rename = "userID")]
+    pub user_id: i64,
+    pub deploy_version: i64,
+    pub model_code: String,
+    #[serde(rename = "coalitionID")]
+    pub coalition_id: i64,
+    pub os_version: OsVersion,
+    pub capture_time: String,
+    pub code_signing_monitor: i64,
+    pub incident: String,
+    pub pid: i64,
+    pub translated: bool,
+    pub cpu_type: String,
+    #[serde(rename = "roots_installed")]
+    pub roots_installed: i64,
+    #[serde(rename = "bug_type")]
+    pub bug_type: String,
+    pub proc_launch: String,
+    pub proc_start_abs_time: i64,
+    pub proc_exit_abs_time: i64,
+    pub proc_name: String,
+    pub proc_path: String,
+    pub bundle_info: BundleInfo,
+    pub store_info: StoreInfo,
+    pub parent_proc: String,
+    pub parent_pid: i64,
+    pub coalition_name: String,
+    pub crash_reporter_key: String,
+    #[serde(rename = "codeSigningID")]
+    pub code_signing_id: String,
+    #[serde(rename = "codeSigningTeamID")]
+    pub code_signing_team_id: String,
+    pub code_signing_flags: i64,
+    pub code_signing_validation_category: i64,
+    pub code_signing_trust_level: i64,
+    pub instruction_byte_stream: InstructionByteStream,
+    pub sip: String,
+    pub exception: Exception,
+    pub termination: Termination,
+    pub asi: Asi,
+    pub ext_mods: ExtMods,
+    pub faulting_thread: Option<i64>,
+    pub threads: Vec<Thread>,
+    pub used_images: Vec<UsedImage>,
+    pub shared_cache: SharedCache,
+    pub vm_summary: String,
+    pub legacy_info: LegacyInfo,
+    pub log_writing_signature: String,
+    pub trial_info: TrialInfo,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct OsVersion {
+    pub train: String,
+    pub build: String,
+    pub release_type: String,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct BundleInfo {
+    #[serde(rename = "CFBundleShortVersionString")]
+    pub cfbundle_short_version_string: String,
+    #[serde(rename = "CFBundleVersion")]
+    pub cfbundle_version: String,
+    #[serde(rename = "CFBundleIdentifier")]
+    pub cfbundle_identifier: String,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct StoreInfo {
+    pub device_identifier_for_vendor: String,
+    pub third_party: bool,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct InstructionByteStream {
+    #[serde(rename = "beforePC")]
+    pub before_pc: String,
+    #[serde(rename = "atPC")]
+    pub at_pc: String,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Exception {
+    pub codes: String,
+    pub raw_codes: Vec<i64>,
+    #[serde(rename = "type")]
+    pub type_field: String,
+    pub subtype: Option<String>,
+    pub signal: String,
+    pub port: Option<i64>,
+    pub guard_id: Option<i64>,
+    pub message: Option<String>,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Termination {
+    pub flags: i64,
+    pub code: i64,
+    pub namespace: String,
+    pub indicator: String,
+    pub by_proc: String,
+    pub by_pid: i64,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Asi {
+    #[serde(rename = "libsystem_c.dylib")]
+    pub libsystem_c_dylib: Vec<String>,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct ExtMods {
+    pub caller: ExtMod,
+    pub system: ExtMod,
+    pub targeted: ExtMod,
+    pub warnings: i64,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct ExtMod {
+    #[serde(rename = "thread_create")]
+    pub thread_create: i64,
+    #[serde(rename = "thread_set_state")]
+    pub thread_set_state: i64,
+    #[serde(rename = "task_for_pid")]
+    pub task_for_pid: i64,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Thread {
+    pub thread_state: HashMap<String, Value>,
+    pub id: i64,
+    pub triggered: Option<bool>,
+    pub name: Option<String>,
+    pub queue: Option<String>,
+    pub frames: Vec<Frame>,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Frame {
+    pub image_offset: i64,
+    pub symbol: Option<String>,
+    pub symbol_location: Option<i64>,
+    pub image_index: usize,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct UsedImage {
+    pub source: String,
+    pub arch: Option<String>,
+    pub base: i64,
+    #[serde(rename = "CFBundleShortVersionString")]
+    pub cfbundle_short_version_string: Option<String>,
+    #[serde(rename = "CFBundleIdentifier")]
+    pub cfbundle_identifier: Option<String>,
+    pub size: i64,
+    pub uuid: String,
+    pub path: Option<String>,
+    pub name: Option<String>,
+    #[serde(rename = "CFBundleVersion")]
+    pub cfbundle_version: Option<String>,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct SharedCache {
+    pub base: i64,
+    pub size: i64,
+    pub uuid: String,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct LegacyInfo {
+    pub thread_triggered: ThreadTriggered,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct ThreadTriggered {
+    pub name: String,
+    pub queue: String,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct TrialInfo {
+    pub rollouts: Vec<Rollout>,
+    pub experiments: Vec<Value>,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Rollout {
+    pub rollout_id: String,
+    pub factor_pack_ids: HashMap<String, Value>,
+    pub deployment_id: i64,
+}
--- a/crates/collab/src/api/slack.rs
+++ b/crates/collab/src/api/slack.rs
@@ -0,0 +1,144 @@
+use serde::{Deserialize, Serialize};
+
+/// https://api.slack.com/reference/messaging/payload
+#[derive(Default, Clone, Serialize, Deserialize)]
+pub struct WebhookBody {
+    text: String,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    blocks: Vec<Block>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    thread_ts: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    mrkdwn: Option<bool>,
+}
+
+impl WebhookBody {
+    pub fn new(f: impl FnOnce(Self) -> Self) -> Self {
+        f(Self::default())
+    }
+
+    pub fn add_section(mut self, build: impl FnOnce(Section) -> Section) -> Self {
+        self.blocks.push(Block::Section(build(Section::default())));
+        self
+    }
+
+    pub fn add_rich_text(mut self, build: impl FnOnce(RichText) -> RichText) -> Self {
+        self.blocks
+            .push(Block::RichText(build(RichText::default())));
+        self
+    }
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+/// https://api.slack.com/reference/block-kit/blocks
+pub enum Block {
+    #[serde(rename = "section")]
+    Section(Section),
+    #[serde(rename = "rich_text")]
+    RichText(RichText),
+    // .... etc.
+}
+
+/// https://api.slack.com/reference/block-kit/blocks#section
+#[derive(Default, Clone, Serialize, Deserialize)]
+pub struct Section {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    text: Option<Text>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    fields: Vec<Text>,
+    // fields, accessories...
+}
+
+impl Section {
+    pub fn text(mut self, text: Text) -> Self {
+        self.text = Some(text);
+        self
+    }
+
+    pub fn add_field(mut self, field: Text) -> Self {
+        self.fields.push(field);
+        self
+    }
+}
+
+/// https://api.slack.com/reference/block-kit/composition-objects#text
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum Text {
+    #[serde(rename = "plain_text")]
+    PlainText { text: String, emoji: bool },
+    #[serde(rename = "mrkdwn")]
+    Markdown { text: String, verbatim: bool },
+}
+
+impl Text {
+    pub fn plain(s: String) -> Self {
+        Self::PlainText {
+            text: s,
+            emoji: true,
+        }
+    }
+
+    pub fn markdown(s: String) -> Self {
+        Self::Markdown {
+            text: s,
+            verbatim: false,
+        }
+    }
+}
+
+#[derive(Default, Clone, Serialize, Deserialize)]
+pub struct RichText {
+    elements: Vec<RichTextObject>,
+}
+
+impl RichText {
+    pub fn new(f: impl FnOnce(Self) -> Self) -> Self {
+        f(Self::default())
+    }
+
+    pub fn add_preformatted(
+        mut self,
+        build: impl FnOnce(RichTextPreformatted) -> RichTextPreformatted,
+    ) -> Self {
+        self.elements.push(RichTextObject::Preformatted(build(
+            RichTextPreformatted::default(),
+        )));
+        self
+    }
+}
+
+/// https://api.slack.com/reference/block-kit/blocks#rich_text
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum RichTextObject {
+    #[serde(rename = "rich_text_preformatted")]
+    Preformatted(RichTextPreformatted),
+    // etc.
+}
+
+/// https://api.slack.com/reference/block-kit/blocks#rich_text_preformatted
+#[derive(Clone, Default, Serialize, Deserialize)]
+pub struct RichTextPreformatted {
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    elements: Vec<RichTextElement>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    border: Option<u8>,
+}
+
+impl RichTextPreformatted {
+    pub fn add_text(mut self, text: String) -> Self {
+        self.elements.push(RichTextElement::Text { text });
+        self
+    }
+}
+
+/// https://api.slack.com/reference/block-kit/blocks#element-types
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum RichTextElement {
+    #[serde(rename = "text")]
+    Text { text: String },
+    // etc.
+}
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -282,7 +282,6 @@ impl Database {
                        git_status: ActiveValue::set(None),
                        is_external: ActiveValue::set(entry.is_external),
                        is_deleted: ActiveValue::set(false),
-                        is_hidden: ActiveValue::set(entry.is_hidden),
                        scan_id: ActiveValue::set(update.scan_id as i64),
                        is_fifo: ActiveValue::set(entry.is_fifo),
                    }
@@ -301,7 +300,6 @@ impl Database {
                        worktree_entry::Column::MtimeNanos,
                        worktree_entry::Column::CanonicalPath,
                        worktree_entry::Column::IsIgnored,
-                        worktree_entry::Column::IsHidden,
                        worktree_entry::Column::ScanId,
                    ])
                    .to_owned(),
@@ -907,7 +905,6 @@ impl Database {
                        canonical_path: db_entry.canonical_path,
                        is_ignored: db_entry.is_ignored,
                        is_external: db_entry.is_external,
-                        is_hidden: db_entry.is_hidden,
                        // This is only used in the summarization backlog, so if it's None,
                        // that just means we won't be able to detect when to resummarize
                        // based on total number of backlogged bytes - instead, we'd go
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -671,7 +671,6 @@ impl Database {
                            canonical_path: db_entry.canonical_path,
                            is_ignored: db_entry.is_ignored,
                            is_external: db_entry.is_external,
-                            is_hidden: db_entry.is_hidden,
                            // This is only used in the summarization backlog, so if it's None,
                            // that just means we won't be able to detect when to resummarize
                            // based on total number of backlogged bytes - instead, we'd go
--- a/crates/collab/src/db/tables/worktree_entry.rs
+++ b/crates/collab/src/db/tables/worktree_entry.rs
@@ -19,7 +19,6 @@ pub struct Model {
    pub is_ignored: bool,
    pub is_external: bool,
    pub is_deleted: bool,
-    pub is_hidden: bool,
    pub scan_id: i64,
    pub is_fifo: bool,
    pub canonical_path: Option<String>,
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -153,6 +153,7 @@ pub struct Config {
    pub prediction_api_key: Option<Arc<str>>,
    pub prediction_model: Option<Arc<str>>,
    pub zed_client_checksum_seed: Option<String>,
+    pub slack_panics_webhook: Option<String>,
    pub auto_join_channel_id: Option<ChannelId>,
    pub supermaven_admin_api_key: Option<Arc<str>>,
 }
@@ -203,6 +204,7 @@ impl Config {
            prediction_api_key: None,
            prediction_model: None,
            zed_client_checksum_seed: None,
+            slack_panics_webhook: None,
            auto_join_channel_id: None,
            migrations_path: None,
            seed_path: None,
--- a/crates/collab/src/tests/channel_buffer_tests.rs
+++ b/crates/collab/src/tests/channel_buffer_tests.rs
@@ -323,8 +323,8 @@ fn assert_remote_selections(
            let CollaboratorId::PeerId(peer_id) = s.collaborator_id else {
                panic!("unexpected collaborator id");
            };
-            let start = s.selection.start.to_offset(snapshot.buffer_snapshot());
-            let end = s.selection.end.to_offset(snapshot.buffer_snapshot());
+            let start = s.selection.start.to_offset(&snapshot.buffer_snapshot);
+            let end = s.selection.end.to_offset(&snapshot.buffer_snapshot);
            let user_id = collaborators.get(&peer_id).unwrap().user_id;
            let participant_index = hub.user_participant_indices(cx).get(&user_id).copied();
            (participant_index, start..end)
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use call::ActiveCall;
 use editor::{
-    DocumentColorsRenderMode, Editor, FETCH_COLORS_DEBOUNCE_TIMEOUT, RowInfo, SelectionEffects,
+    DocumentColorsRenderMode, Editor, RowInfo, SelectionEffects,
    actions::{
        ConfirmCodeAction, ConfirmCompletion, ConfirmRename, ContextMenuFirst,
        ExpandMacroRecursively, MoveToEnd, Redo, Rename, SelectAll, ToggleCodeActions, Undo,
@@ -1272,7 +1272,7 @@ async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut Tes
    fake_language_server.start_progress("the-token").await;

    executor.advance_clock(SERVER_PROGRESS_THROTTLE_TIMEOUT);
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
            lsp::WorkDoneProgressReport {
@@ -1306,7 +1306,7 @@ async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut Tes
    });

    executor.advance_clock(SERVER_PROGRESS_THROTTLE_TIMEOUT);
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
            lsp::WorkDoneProgressReport {
@@ -2041,10 +2041,6 @@ async fn test_mutual_editor_inlay_hint_cache_update(
    });
 }

-// This test started hanging on seed 2 after the theme settings
-// PR. The hypothesis is that it's been buggy for a while, but got lucky
-// on seeds.
-#[ignore]
 #[gpui::test(iterations = 10)]
 async fn test_inlay_hint_refresh_is_forwarded(
    cx_a: &mut TestAppContext,
@@ -2409,7 +2405,6 @@ async fn test_lsp_document_color(cx_a: &mut TestAppContext, cx_b: &mut TestAppCo
        .unwrap();

    color_request_handle.next().await.unwrap();
-    executor.advance_clock(FETCH_COLORS_DEBOUNCE_TIMEOUT);
    executor.run_until_parked();

    assert_eq!(
@@ -2849,7 +2844,7 @@ async fn test_lsp_pull_diagnostics(
    });

    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
+        &lsp::PublishDiagnosticsParams {
            uri: lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
            diagnostics: vec![lsp::Diagnostic {
                range: lsp::Range {
@@ -2870,7 +2865,7 @@ async fn test_lsp_pull_diagnostics(
        },
    );
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
+        &lsp::PublishDiagnosticsParams {
            uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
            diagnostics: vec![lsp::Diagnostic {
                range: lsp::Range {
@@ -2892,7 +2887,7 @@ async fn test_lsp_pull_diagnostics(
    );

    if should_stream_workspace_diagnostic {
-        fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+        fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
            token: expected_workspace_diagnostic_token.clone(),
            value: lsp::ProgressParamsValue::WorkspaceDiagnostic(
                lsp::WorkspaceDiagnosticReportResult::Report(lsp::WorkspaceDiagnosticReport {
@@ -3074,7 +3069,7 @@ async fn test_lsp_pull_diagnostics(
    });

    if should_stream_workspace_diagnostic {
-        fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+        fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
            token: expected_workspace_diagnostic_token.clone(),
            value: lsp::ProgressParamsValue::WorkspaceDiagnostic(
                lsp::WorkspaceDiagnosticReportResult::Report(lsp::WorkspaceDiagnosticReport {
--- a/crates/collab/src/tests/git_tests.rs
+++ b/crates/collab/src/tests/git_tests.rs
@@ -84,11 +84,7 @@ async fn test_project_diff(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext)
    diff.update(cx_b, |diff, cx| {
        assert_eq!(
            diff.excerpt_paths(cx),
-            vec![
-                rel_path("changed.txt").into_arc(),
-                rel_path("deleted.txt").into_arc(),
-                rel_path("created.txt").into_arc()
-            ]
+            vec!["changed.txt", "deleted.txt", "created.txt"]
        );
    });

@@ -125,11 +121,7 @@ async fn test_project_diff(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext)
    diff.update(cx_b, |diff, cx| {
        assert_eq!(
            diff.excerpt_paths(cx),
-            vec![
-                rel_path("deleted.txt").into_arc(),
-                rel_path("unchanged.txt").into_arc(),
-                rel_path("created.txt").into_arc()
-            ]
+            vec!["deleted.txt", "unchanged.txt", "created.txt"]
        );
    });
 }
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -4077,7 +4077,7 @@ async fn test_collaborating_with_diagnostics(
        .receive_notification::<lsp::notification::DidOpenTextDocument>()
        .await;
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
+        &lsp::PublishDiagnosticsParams {
            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
@@ -4097,7 +4097,7 @@ async fn test_collaborating_with_diagnostics(
        .await
        .unwrap();
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
+        &lsp::PublishDiagnosticsParams {
            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
@@ -4171,7 +4171,7 @@ async fn test_collaborating_with_diagnostics(

    // Simulate a language server reporting more errors for a file.
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
+        &lsp::PublishDiagnosticsParams {
            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
            version: None,
            diagnostics: vec![
@@ -4269,7 +4269,7 @@ async fn test_collaborating_with_diagnostics(

    // Simulate a language server reporting no errors for a file.
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
+        &lsp::PublishDiagnosticsParams {
            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
            version: None,
            diagnostics: Vec::new(),
@@ -4365,7 +4365,7 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
        .await
        .into_response()
        .unwrap();
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin(
            lsp::WorkDoneProgressBegin {
@@ -4376,7 +4376,7 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
    });
    for file_name in file_names {
        fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-            lsp::PublishDiagnosticsParams {
+            &lsp::PublishDiagnosticsParams {
                uri: lsp::Uri::from_file_path(Path::new(path!("/test")).join(file_name)).unwrap(),
                version: None,
                diagnostics: vec![lsp::Diagnostic {
@@ -4389,7 +4389,7 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
            },
        );
    }
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End(
            lsp::WorkDoneProgressEnd { message: None },
@@ -6514,8 +6514,14 @@ async fn test_right_click_menu_behind_collab_panel(cx: &mut TestAppContext) {
    cx.simulate_keystrokes("cmd-n cmd-n cmd-n");
    cx.update(|window, _cx| window.refresh());

+    let tab_bounds = cx.debug_bounds("TAB-2").unwrap();
    let new_tab_button_bounds = cx.debug_bounds("ICON-Plus").unwrap();

+    assert!(
+        tab_bounds.intersects(&new_tab_button_bounds),
+        "Tab should overlap with the new tab button, if this is failing check if there's been a redesign!"
+    );
+
    cx.simulate_event(MouseDownEvent {
        button: MouseButton::Right,
        position: new_tab_button_bounds.center(),
--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ b/crates/collab/src/tests/randomized_test_helpers.rs
@@ -183,10 +183,9 @@ pub async fn run_randomized_test<T: RandomizedTest>(

    for (client, cx) in clients {
        cx.update(|cx| {
-            let settings = cx.remove_global::<SettingsStore>();
+            let store = cx.remove_global::<SettingsStore>();
            cx.clear_globals();
-            cx.set_global(settings);
-            theme::init(theme::LoadThemes::JustBase, cx);
+            cx.set_global(store);
            drop(client);
        });
    }
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -172,7 +172,6 @@ impl TestServer {
            }
            let settings = SettingsStore::test(cx);
            cx.set_global(settings);
-            theme::init(theme::LoadThemes::JustBase, cx);
            release_channel::init(SemanticVersion::default(), cx);
            client::init_settings(cx);
        });
@@ -600,6 +599,7 @@ impl TestServer {
                prediction_api_key: None,
                prediction_model: None,
                zed_client_checksum_seed: None,
+                slack_panics_webhook: None,
                auto_join_channel_id: None,
                migrations_path: None,
                seed_path: None,
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -248,7 +248,7 @@ impl ChannelView {
            .editor
            .update(cx, |editor, cx| editor.snapshot(window, cx));

-        if let Some(outline) = snapshot.buffer_snapshot().outline(None)
+        if let Some(outline) = snapshot.buffer_snapshot.outline(None)
            && let Some(item) = outline
                .items
                .iter()
@@ -305,7 +305,7 @@ impl ChannelView {

        let mut closest_heading = None;

-        if let Some(outline) = snapshot.buffer_snapshot().outline(None) {
+        if let Some(outline) = snapshot.buffer_snapshot.outline(None) {
            for item in outline.items {
                if item.range.start.to_display_point(&snapshot) > position {
                    break;
@@ -508,6 +508,10 @@ impl Item for ChannelView {
        }))
    }

+    fn is_singleton(&self, _cx: &App) -> bool {
+        false
+    }
+
    fn navigate(
        &mut self,
        data: Box<dyn Any>,
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -922,7 +922,7 @@ impl CollabPanel {

        ListItem::new(user.github_login.clone())
            .start_slot(Avatar::new(user.avatar_uri.clone()))
-            .child(render_participant_name_and_handle(user))
+            .child(Label::new(user.github_login.clone()))
            .toggle_state(is_selected)
            .end_slot(if is_pending {
                Label::new("Calling").color(Color::Muted).into_any_element()
@@ -2505,7 +2505,7 @@ impl CollabPanel {
                h_flex()
                    .w_full()
                    .justify_between()
-                    .child(render_participant_name_and_handle(&contact.user))
+                    .child(Label::new(github_login.clone()))
                    .when(calling, |el| {
                        el.child(Label::new("Calling").color(Color::Muted))
                    })
@@ -2940,14 +2940,6 @@ fn render_tree_branch(
    .h(line_height)
 }

-fn render_participant_name_and_handle(user: &User) -> impl IntoElement {
-    Label::new(if let Some(ref display_name) = user.name {
-        format!("{display_name} ({})", user.github_login)
-    } else {
-        user.github_login.to_string()
-    })
-}
-
 impl Render for CollabPanel {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
@@ -3178,8 +3170,8 @@ struct JoinChannelTooltip {
 }

 impl Render for JoinChannelTooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |container, cx| {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        tooltip_container(window, cx, |container, _, cx| {
            let participants = self
                .channel_store
                .read(cx)
@@ -3191,7 +3183,7 @@ impl Render for JoinChannelTooltip {
                    h_flex()
                        .gap_2()
                        .child(Avatar::new(participant.avatar_uri.clone()))
-                        .child(render_participant_name_and_handle(participant))
+                        .child(Label::new(participant.github_login.clone()))
                }))
        })
    }
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -18,7 +18,7 @@ pub struct NotificationPanelSettings {
 }

 impl Settings for CollaborationPanelSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut ui::App) -> Self {
        let panel = content.collaboration_panel.as_ref().unwrap();

        Self {
@@ -30,7 +30,7 @@ impl Settings for CollaborationPanelSettings {
 }

 impl Settings for NotificationPanelSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
+    fn from_settings(content: &settings::SettingsContent, _cx: &mut ui::App) -> Self {
        let panel = content.notification_panel.as_ref().unwrap();
        return Self {
            button: panel.button.unwrap(),
--- a/crates/collections/Cargo.toml
+++ b/crates/collections/Cargo.toml
@@ -1,10 +1,9 @@
 [package]
-name = "zed-collections"
+name = "collections"
 version = "0.1.0"
 edition.workspace = true
-publish = true
+publish.workspace = true
 license = "Apache-2.0"
-description = "Standard collection type re-exports used by Zed and GPUI"

 [lints]
 workspace = true
--- a/Show More
+++ b/Show More